cleaned up CommandRegistry