Added puppet cleanup
Added support for puppet