New port and some cleanup