more render cleanup