More clean up and bug fixes for teaching mode
Temporary routing fix until system reworked
Attempt to catch common get undefined error
Revert "Attempt to catch common get undefined error"

This reverts commit d450e93fd3f17827c36e47851cbcc99a4c41d4ed.