Remove -B related stuff from REPL.
Minor simplification