cleanup - remove commented code.
fix repeat locales in link bug