merge forward (manually) the cleanup of the renderer calling code