Clean up settings a lot