Remove some CLI commands
Working on comment.