Removed debug code
Merge branch 'dev-entities' into dev