MOre repository cleanup