Clean up the patches / redo them.
