Remove redundant underscores