Fix memory leak visible apollo driver (nw)
modernized apollo a little bit more (nw)