further code cleaning
no more trunk support but 8.0dev (which is trunk)
fix doubled wget call