More settlement scenarios. Cleanup.