code clean up (step 1) jenkins broken