drop addrgen, rework