Remove CALIPSO height workaround, finally