cleanup2
Cleanup 2 + Spatial Network addition