patches: cleanup 2/2