Remove unnecessary underscores