Revert "Jess/Arthur Changes"

This reverts commit 6b02dd440c67126064dfa45787c485d8847d1035.