Removed unused templates
Code cleanup