remove unnecessary NULL checks