Interface cleanup
More refactoring that allows us to create more suitable maps for recommender entries
More cleanup: don't preserve methods only for testing them