Yes. All this "stuff" was tacked on AFTER TOS went off the air. It was a great show---but these utopian messages were really only a fraction of the content of the program. And Kirk and or Bones were foils and dissenters against some of it-the PC diatribes usually were made by Spock. Kirk or Bones were usually a stand in for the average Joe in the audience. In the end Spock was often right--but still the opposing views were heard and sometimes Spock was wrong, sort of. With TNG you had a whole crew drinking the kool-aid of a sort of pseudo-socialist agenda with little dissent. Picard's smugness told the audience he fully expected everyone to agree with his post-post-modern world view. People will say "look to Roddenberry," but TOS in reality never put to the screen a pure Roddenberry concept---the final product was an amalgamation of different people's input.