Remove dead code and Englishify slightly.