Refactored user data removal