Revert "Abstracted a bunch of server commonalities"

This reverts commit b32de14d61243e7e778c30e91e0121b23e05884e.