Merge "Remove the port list that is not used"