Server cleanup

See commit history.