Revert "Re-Add Trebuchet"

This reverts commit f965e5fc2b4e17fc80f455025b622b682e14ce51.