remove extraneous underscores