Minor server code cleanup