Reduce scope of the BaseRemove step (only hand over the datamanager)

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>