cleaned up zapdups