About to do fairly massive cleanup