Updated some cleaning of image/rpi