Revert "Server++"

This reverts commit 503ccd8be67c09224e367135adfa4b4a3efec67f.