Fixed an issue when removing entities; making sure I can delete on the fly.