Update and clean up config