code cleanup (comments and unused code)