Refactored and removed old network interfaces