Added remove sensor image and did a little code clean up.