Remove this and do the same way we do in mica_export