Remove previous template classes