Remove deprecated methods, the Datastore service, and tidy up generally. Add intelligence to MappedClass.