Clean up the defaults