cleanup adaptive

Change-Id: I2e8b0e9b481930f7abb60fce0b229ed58d2702ed