Remove superfluous underscores