Cleaning up config