Merge "Remove dead code from NetworkManagementService" into main