Added EntityRemover

Change-Id: I7c2781d400b7008a936703f406622fdbdf4f214f