Modification for SoftAP Onboarding cleanup