Clone cleanup

Fixes #2330 

@dinhviethoa PTAL Thanks.