WIP for removing state
Completed making rest server stateless