Cleanup & remove need for network origin.