Refactored calibration, bypassed self-filtering for now