Remove old methods and unused imports