Clean up

Change-Id: Ibec5be85b5b9f1bfd885c8e1d08dcbc002b208e0