cleaner way to remove the port switch