Clean up commented-out code
Add connection manager
Revert "Add connection manager"

This reverts commit d4d6e375c6f2f8be9282b86f8bb584aab4d6910e.
Add framework for checking client connections