Issue/pup 2349/cleanup warning during pluginsync

I'm :+1: for this given the alternative appears to require a breaking change, if I'm interpreting this discussion correctly.