More cleanup on virtual server reporting