Cheating Jenkins, and a code cleanup