toro: Remove blobs after consolidation

Change-Id: Iab26c4cee7d90648cacf7ffa24fa1aead094cc7a
Consolidate tuna props

Change-Id: I83ab3192614aaa847f0a14ee116ec91522bc4c7c