Fixed not working entity removal