Did quick cleanup of client/server code
Merge origin/master