Massive cleanup.