Fernet is right. XP related code can go as we won't run on XP anyway.