Cleaned up account components of network stack.

Needs a test-run before I begin connection work.