Remove correct port; update indexes