Remove debuggin code and unused methods