cleanup translations (WIP)

Change-Id: I74ea11816b53e4e2a4b6f6bdb1d6ab6067e735e2