Remove dereference after null check and dead code