XD-1271: Remove job options from the shell