More Jenkins job cleanups