Fix unwanted NULL keys: Disabled versioning cleaning (not mandatory and more secure)