Cleanup for Waldo