Removed calibration from inside build functions.