yeah but not completely
all it took was Toei remembering, "oh hey didn't Gohan unlock a form nobody else can use?" to revert him to being an "okay" warrior
it was stated early on that there's no longer even a use for Ninja's in their society anymore because of the treaty Naruto orchestrated
why they still have a Ninja academy makes no sense because of that