Put entity removal stuff back in (woops)