Incoming packets refactor for dispersy cleanup