Removes 'Users' and changes to templates