Clean up config a bit more