config cleanup, and removal of some dead code