Fixed entity removal