Refactored user delete