Removed some more settings files that would otherwise provice conflicts