FW-198. A minor fix for SCons help, and remove some commented code