Remove Trebuchet overlay

Change-Id: I6c34a00478b8929c35a44139e33efa8026c01f09
Remove unused flag

Change-Id: Ie85f1b383326827009bfbf7408cd38bb2a64fed7