2001 cleanup