Code cleaning - suppress non useful code

Change-Id: I3f3bffdd1f5d64a6b601d56bee3b5fc8147086bd
1 file changed