Remove old cli section, small revisions