Removed Unused templates for now