Revert "Revert "More calibration clean up.""

This reverts commit 6c3da21d5bd23fc2d312c02ddafdd216bd22673f.