Remove dead code
Eliminate a nil check