remove diff stuff