Repository clean up and multi group extension