More progress with cleanup