Cleaned up various obsolete and broken models and fixed easily fixable issues.