remove override_uri from all classes, check for property first