[REFACTOR] removed redundant code

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