While reviewing config centralization patches I realized that
we have a fair few files where we import cfg or setup CONF, but
never actually use config variables.
This patch cleans those up, but I am sure we'll add more as we
move more flags around.
Change-Id: I5851bbae2fa198a4e9be149a5836bea813848d89