Merge "[SdkSetup]  Clean up"