Remove Trebuchet overlay

Change-Id: I161f9251e5e35c113a94c623b597c0c5ca883b35
Remove unused flag

Change-Id: I6c8c893d04f48ca96b58755f65027af2129bf7fb