Cleaning Up the Renderer API