first cut after cleanup