Remove reference to metadata utilities