Remove a final nil check