cleanup filer and fileSystem refs, use filer in template_loader