Remove some soon-to-be-merged ports