Remove references to bundle