Remove datamanager dependency