Removed some legacy entity creation stuff
Remove some legacy entity creation stuff