m7: cleanup