fix: remove old fields