Removed superfluous lines

Piles of stuff that had been commented out.