Revert "Server Software Inital Update"

This reverts commit 7b5217f25910d0fc494996c424a33a9cf3f2061a.