Fix patch
Remove patches I no longer use