Use Renderer.views and remove old logic