Remove Trebuchet overlay

Change-Id: I502f27d22784f5291b0bddd7697f3f35614edbff
Remove unused flag

Change-Id: I69e4ea8f210b6a2c3f3e6570644328b55bd6631d