code clean up

Change-Id: I30cea3e682f94d658e05cff7b39687b2173714c1
Reviewed-on: https://git.eclipse.org/r/34713
Tested-by: Hudson CI
Reviewed-by: Andreas Hoegger <Andreas.Hoegger@bsiag.com>