cleanup bundle integration
v2.0.0