Fixed invalid doctrine annotations.
Helper methods from entites removed.

Reduces number of queries dramatically.