Remove unused code

[therve]

Cleanup duplicated code in model definition.

[github-actions[bot]]

This issue has been automatically marked as stale because it has not had activity in the last 30 days. Note that the issue will not be automatically closed, but this notification will remind us to investigate why there's been inactivity.