removed WappZapp specific code