More cleanup

Removed components that were only there to test network capabilities.