Merge "removed hardcoded non-local repo classes"