Remove Image template

Change-Id: I723e09babdab8c62d09f3bfc83dc74348beb6ff3