update logic to be clearer and use new shutil remove
update logic to be clearer and use new shutil remove

gmatteo/monty,materialsvirtuallab/monty,gmatteo/monty,davidwaroquiers/monty,davidwaroquiers/monty,materialsvirtuallab/monty