Remove old template and improve newer templates