Cleanup

Change-Id: I3254fe44dfe7cd2a6e7ec723327e50e800a189a4