Apply changes of code review - Remove GetImageId