Clean up some of the commands