Start to clean up some tech debt on the server