changes related to command.datastore cleanup

and parameter processing local <> server