Revert change of Scala REPL class
Remove unused imports