MDL-30085 core_grade: clean up