cleanup all things

Change-Id: I8c79ea73b4a8887c1bad0c341033105a93921dd8