Maintain templates.js embed
handle timeout cancellation and correct utils usage