Take two: Cleanup