Remove m7 defines