Removed unnecessary fields from Measurements