Remove unnecessary None check