fix entity remove things, but no dice