More server-side cleanup.