Cleanup and fixed network split