Clean up

Change-Id: I3fc017fb5ef1fe704d273d667405eee588fa35cb