Remove commented out scope code.
Add TemplateFromFile and TemplateFromString classes.