Grade refactor cleanup.