cleanup for template provider
cleanup for template provider