fixup! fixup! Clean up network_interface