Cleaned up final references to Task.USER