Clean up the commands