Removed useless fwd decl
Removed useless member
Manager is now obtained from entity
Fixed uninitialized counters
Minor changes/refactoring