cleaning code and unused