cleanup - first cut