Hooked up EntityRemover to lower level components

Change-Id: I97f44b88051c5e3dd65e0d84b8233056ed775e72
Merge "Hooked up EntityRemover to lower level components"