removed some setting that don't always apply