Revert "track omni launcher3"

This reverts commit e6bdb8fee6eb58d62ff0213667f96b594764bd77.
Revert "add the new trebuchet"

This reverts commit d12ac685b1ae8cfff0a3fa5166b5d518813be2e5.