remove plain_data Generic workaround