Additional object clean up of Rects/Paints