Issue/pup 2349/cleanup warning during pluginsync