fixed user data cleanup