Cleanup unused files
Merge branch 'tutorial'
Merge branch 'master' into tutorial