Some cleanup
Commit before all-to-all client server design