Get rid of trailing underscores