simplify plugin bundling a lot