MODE-2093: Multiple repositories (Clean up code)