* Gather all performance related items in one place and drop all deprecated services. Change-Id: I4dbdc164c60136b0957a8c1ff67feafbaf471747