Tutorial clean up