deleted weird lines from the merge

some odd comments appeared from the merge between mine and curt's
branches. deleted them so the code now compiles