Deleted some commented code and unused imports