Render Cleanup

long needed render cleanup