Remove commented out code in the rest of the renderer