Merge "remove repo definition from system classes"