BIGTOP-1442. need to add proper clean up for the toolchain puppet code