Merge "Remove more use of netmask"