[NOP] removed dead code

Change-Id: I4a03b84d43bfa7f06951d1f944fc2be0ac4941b1
Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/1225
Tested-by: Jenkins CI
Reviewed-by: Stefan Rossbach <srossbach@arcor.de>