Fixed ports and removed commented-out code