avn: cleaning up thin client implementation