Same as previous push, except no more commented out code in the server - it's been removed