[cli] cleanup