Clean up config some more