eliminating extra templates.