Sync with the new database model
Delete commented code