Fix warnings and delete unused core data stuff.