Clean up some command stuff