Removal of PixelWebView and minor cleanup.