patches: clean-up