refactoring
fix issue on cli removal
add cli exists check on cli import