XD-1272: Remove job options from the shell