Cleanup: delete some obsolete code, and remove the ModelPackage access control cruft.