Remove unneccessary nil check