some cleanup in RenderSystem