Of course, Civics really needs to be separated out from history and social studies and made into its own separate year-long class. Our populace is way too ignorant on how government works (ours/others) and just basic civics knowledge.
I agree the replacement of civics with social Studies was a major dumbing down