Valgrind: Minor cleanup

Change-Id: I8457accbec28773de24d2921530a6c437de0d9ac
Reviewed-by: hjk <hjk121@nokiamail.com>