Removed port handling