Removed trumpet references from this branch