Cleanup in ClientUpdateTask. final/static all the things!