m7spr: cleanup