More port cleanup