Remove MetadataOnly at the same time as BinData