housekeeping

remove commented out code and methods