removed coredata and warnings