Replaced getNetwork.../getSim... by system property restrictions, optimized upgrade