I'm glad the onclick handlers are being removed from the templates!