Lot of changes, versions are now also correctly removed