Remove m7 stuff