Removed all template code
Remove template code