decom Tampa, remove "maurus" from dsh

< brion> mutante: i think that had search in 2005

:)

Change-Id: Ib8cb799d7c8495dbf14cbbc627741ff51fd6501f
Merge "decom Tampa, remove "maurus" from dsh" into production