Cleaning: client-handler is no longer needed