more cleaning

Change-Id: I0aebd4fdefcc19fc933f76fb5f3fffa834f1e6b5