Removed unnecessary tasks and change jenkins.list to template to take advantage of variables