Clean up InstructorsLogic #1946

As title