Patch clean-up : add modifications and delete uneeded ones