CLI: Removing unused piece of code.
Merge branch 'master' into cli_data_items_management_clean