cleaned up CompositeRepository