unnötigen Code aus Hero gekillt Part 1

Change-Id: I34460baa5df5c6760b1a12f53d8c4fd0ec5f4819
Signed-off-by: Miriam <Miriam@MI-I15z>