#16 Deleted port portion of code