*8087* Remove duplicated/refactored settings