Fixed up the RIMG lazy loading and cleaned it up