Cleanup server routes and helpers