Remove settings same as default or removed from MW completely

Change-Id: I66c2daa3550fb33432ebaadb3e86136030579510