MDL-47146 grades: Removed unused setup columns