Server-side code cleanup
Resolved merge