Slow cleanup of the command line

See title