except for..

a) one use in sw which we can replace with a map
b) one use in svx which didn't do anything
c) one amusing piece of crazy in cui

Change-Id: If66d9f7eab1eaddfb2bdab7815c3a6f22f4d7745