Simpler server macro
Cleanup
This was an incompatible change