m7-common: cleanup for evervolv