Remove disconnect debug code and re-rig the argument callback