Removes legacy bundles from products
Fixes classcast exception