Add optimization patches

Also remove merged patches