Remove unused l10n strings & move others to correct component