remove some "with context" from template imports
15 files changed