Some net cleanup, still working on generic interface