Remove commented code and unused method.