Remove pickle requirement