Config code cleanup