Remove some None checks