Cleanup: a simpler and more efficient approach.