Remove some old port patches