migration to new bundle scheme, cleaning up some assets