Removed some gacky hacks we used in Gallivant to clean up tutorial