cleanup and bug fix for no duty

Signed-off-by: Jeffrey Wells <jwells@newrelic.com>