remove dead code; comment out currently unused variables