Removed unnused template and simplified other templates.