Cleaned up 426 lines of dead code and unresolved conflict markers (<<<<<<< HEAD, =======, >>>>>>>) left over from rebase. File reduced from 1102 to 676 lines.
Cleaned up 426 lines of dead code and unresolved conflict markers (<<<<<<< HEAD, =======, >>>>>>>) left over from rebase. File reduced from 1102 to 676 lines.