Updated template deletion code
Less scrolling...