Fix Internet Check + remove redundant codes