3.0 plugin bake

Fix the issue in #3964 and remove vestigial directories that we don't need anymore.