Remove unimplemented overlay items

Change-Id: Id1cebabd831f6db230d628249fe4e9a4bb9a575c