17 - clean-up4 - aug09