REPL + CLI: Remove uneeded code