Cleaned up connection and startup handlers.