patches: cleanup