slight improvements to zeta code; remove old implementation