RenderPlanner gone, sundry cleanups