Some more cleanup, translations