Classroom updates
Revert "Classroom updates"

This reverts commit a151320fa20667d1a18e563441e03b496b3039ff.