Moved port removal up a level.