Clean up config handling