Revert "More controller work"

This reverts commit 03c437321ba6d2ffaff218efb8a0fb7002d5a15d.
Revert "Basic network controller"

This reverts commit 88a22d68fe95fdd3f247395bb9d2e221252f29ea.