Small clean

Change-Id: I971a6f0f6f9f318b9d791820b418509cff076249