Clone cleanup

Fixes #2330 

@dinhviethoa PTAL Thanks.
@dinhviethoa  The root folder is deleted here.