FLUID-5054: Removed redundant code from grade resolution following review