Cleanup will continue...