Clean up ServerConnection a bit