Initial web 2.0 drop - clean up still needed