WIP client and server cleanup