Cleanup server code
v1.1.0