Clean up Setting
model and remove dead code
#28661
Merged
Setting
model and remove dead code
#28661