clean up settings (bug 999774)