fix: remove old fields
Merge branch 'freeze' into develop