Config structure clean up