Cleaning up config stuff