cleaned up settings