Remove dead code, add config setting.