Changing where preferences are removed

This will fix the bug where if you enable a setting then later change it
to "Not Configured" the setting is properly removed.