Remove obsolete template and harmonize UpdateManager code