Remove Noir dependency