Cleanout commented code and unused variables.