2001 more cleanup