Remove some settings that were reaching too far