MDL-30085 cleaned up of grading external API