Clean up command creation