Command line cleanup