More RenderState cleanup