Removing the legacy data field