remove old cli code
add or remove some comment