removed references to core data