Remove old Trebuchet overlay and fix ion.h/msm_ion.h