Remove old and unused imports