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