Cleanups on models
Cleanups on properties
Cleanups on cached properties