Few changes, removing cli