Clean up; add new basic network