Start clearing out unanchored funcs from cli package

[ripienaar]

Bit of a long slog as much depends on opts which lives in cli that will have to move to really finish this but its a start