change name so it doesn't conflict with existing job; remove commented out branches