cleanup qnames