Remove TODO in RepositoryBuilder with cleaner fix to createFactset