remove large sections of commented code; general clean-up