Initial cleanups
Update1 from Samsung opensource

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