Fix port removal