Code cleanup

Change-Id: Ia5a13c28863780fef37d1bfe81f605dab9d06a07