Clean up, and set default in config to false