dsh - remove last Tampa remnants

all of these are gone now, these
should be the very last Tampa references
in dsh groups

Change-Id: Id1804b87a915690b89451b84d3a344d8aaf248df