Let's clean up these configurations