coverage update and template cleaning