A Much Needed Cleanup.