[dogfooding][cleanup] Use static inner class clean up for team code

Using this cleanup brings:
- It reviews the feature
 - For optimization: small memory usage reduction as the outer pointer
is removed

Change-Id: I85c3e8d93c8b567296c3a7a4a0133d6ce635dda3
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>