cleaned up command