Cleanup, Prevent overlapping variables, Don't rebuild config