Removed method and unused imports