removed use of deprecated templates