Cleanup

Change-Id: I3e16c21a0e98d31b43814572e2bf05f21779f9fb
NI1: Fingerprint

Change-Id: If0842f624ab0406827a2f542f44a0841098602f4