Fix trim trailing hyphens