Start on server-side code cleanup.