Remove data bag dependency