[#1856] Turned on the option to actually clean up metadata