Remove some hardcoded l10n strings
Restore a neccessary trim to fix #75