Clean-up from tutorial prep