Remove unused functions and rename zf to edb-zf