g2 - remove unneeded overlay components

Change-Id: I81a3706c42e951d8f05e8d96b8b2dbb71e8b2833