Change to use PacketTransmitter2, cleaned

Rollback if you don't like the cosmetic changes, still working on
networking