Jobs cleaning and improvements

Change-Id: Icda7a23eb70451a2e224482bafc89ef605ecb87f