Remove commented code of old DataFlavor