Clean up ConnectionServer class