some more underscore removel