Removed all right_api_objects logic.