Begin cleaning up old code, removing files and functions. Simplified Core Data model.
More gutting of code.