Remove references to old settings