removed coupling with coredata