cleanup/core data disabled

core data still disabled from build pending test