Remove unused classes, update PacketUtils