Handle spaces in jobs names
Remove unsed code