Merge "removed unsused ports"