Revert zlib: clean up some dead code