Issue/pup 2349/cleanup warning during pluginsync

And ... I closed #3026 which would be a wire-format change.