Removed redundant template code
Removed unused context