Revert "Revert "Revert "More calibration clean up."""

This reverts commit 9910d5eb0e45315890593e009f27f1266a76d996.