Renderers cleanup part 2