[puppet] Remove dead builders and do some clean up