Remove commented out code and unused variable