Remove a few ports from the tree which have been fixed upstream