Removing un-waned code from port delete

Change-Id: I79f51b9a9069847753a62a23f49f39f160a6056f
Merge "Removing un-waned code from port delete"