remove extraneous NULL checks