Remove depricated template