Seperated clean command
Merge branch 'master' into cli