Eliminating unnecessary GetPacketFactory method
Intermediate commit