Remove ServerViewport. Additional cleanup.