Clean tabs

Change-Id: I98e8dcf170b1b94054616892ab2902054c533227