Remove some more unused configs