getting rid of the EncyclopediaEntry class, refactoring (and marking TODOs) as propagated impacts of that