Looking at how advanced each is, I'd probably move the one from `Server` to `Common`, and delete the one from `Client`.