LRA-181 : remove unused image and remove commented code