Cleaining for SDK 2.0