Replace measurements fields with a single grid field
Removing the old measurement feilds and related code