removed dependencies on entityremover