dropClient refactor hasn't been finished