more incremental cleanup