Clean-up and removed datamanager