Merge "handle removal of self added configurations"