Revert "Config module update, file cleanup"

This reverts commit d6b4c50cf61c2423f9a58e817a64a15c1c56fbe0.