s4-common: cleanup for evervolv