Remove pickle, which causes many merge errors