Issue #5933: Arrangement
1. Remove excess visit
2. Remove RendererTextureCmdCanvas