Code cleanup

Change-Id: I4f8e40038ba7655d2e8420c1bc2899a8fede99f8