updating the config and usage

The config options were improperly specified and utilized.
Also, a needless decorator that is a carry over from
integrated work was removed.

Change-Id: Ieb39c8c4baada8857cc297cc98897d71f0536716
3 files changed