2001 cleanup again