Student Notes: cleanups.

Reverted to version from master.