Reverted some changes to nameclener
Reverted some changes to namecleaner