partial CLI scripts cleanup