Get rid of some stuff that made it into nixpkgs