m7: clean up