Clean up port grouping