Cleanup the cleanup method slightly.