Cleanup
Cleanup for post-tutorial release