clean up core data manager logic