temporary solution for v1.4 cleanup_data method