Update to recent versions, fix code, remove leftovers.