Remove dependency on bundle