Remove more underscores