Starting to clean up command registry.