Remove uncommented code and unused imports