Removed several models, migrated code