Clean-up configs