Sign-In Sign-Out clean up