Removed OnEntityCreated "temporary" workaround

"Nothing is more permanent than a temporary solution."
Merge pull request #622 from Python1320/patch-3

Removed OnEntityCreated "temporary" workaround