Remove unused code, don't use zlib functions that are really macros