Remove use of RepositoryOption