Merge "Add directory remove on failed cloning"