Renderers cleanup part 1