Fully migrated to single client