Tires cleaned up

Tires cleaned up