Small cleanup of packet classes