Consolidate, cleanup.