[Server] Remove some unused/commented code