Remove cli related code from scripts.

Cli may be going away, really just useful for quick testing