Renderer partial cleanup

Much work still to be done