More checkout cleanup.