Remove pointless packets and cycles, various