Remove dependency on cli-simple