Indeed, their efforts to run the "Klingon culture is bad" thread got comically awkward in TNG, where they also really hammered on the multiculturalist "all cultures are equally valid" theme. All cultures... except for Klingons, whose barbaric and violent customs are just obviously inferior.