added entity removal helper