Clean up patches a ton, redo all of them. Changes remain mainly the same though