refactor

exclude ServerConnection