removed some more non-names