Cleanup the renderer (remove commented out LOC and refactor).