[NOP] removed dead code

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