Some Render API cleanup