Remove Trebuchet overlay

Change-Id: I7f9a5ca90fcf5872177bf6c722aaa2b0c237cdc1
Remove unused flag

Change-Id: Ib7a9525b02e034307a6a7982233074bec2345cb3