Weird bug in previous commit(s): entity removal now works.