Revert "Final commit for spring semester"

This reverts commit a202ac7b11099726b3b06919f78136e97f605d42.
(CSCS2650) Last minute fix of JK