Removed reliance on cli-toolkit