cleanups

Signed-off-by: Gokulnath A <Gokulnath.Avanashilingam@in.bosch.com>