Remove dependency on Noir