UpdateJob related cleanup

Change-Id: I44e66dfcb9470ef3add95b89a3470d59aa4b2710