Strip out more 'helpdesk' bits, add the last few units to the template