Remove Trebuchet overlay

This is outdated and breaks the new Trebuchet
Merge branch 'cm-11.0' into martincz