Oh okay the school setting in particular, gotcha. Yeah, since the promos would have focused on the stuff in the first two eps before the school it did give a tease early on of a more "next-level shonen" vibe.
I do think it's still a little "edgier" thanks to those first couple of episodes and the more modern touches of the setting but yeah, it's never gotten back to as dark as that once they get to the school.
Yeah, I still expect some silliness, but hopefully it'll re-find it's footing once season 2 gets going, since there were some cool bits to season 1 before things went full anime-only. I expect it'll be a little disorienting in the beginning since it was so long between seasons and there was not really a smooth transition point, when you think about it, the story is still just getting started since only a little over half of season 1 actually happened.