Fixes #2
Removes the major part of isXXX annotations from the entities (task #1)

Still need to remove the languages list annotations