Remove two ports that should be fixed upstream now