proposed change as intermediate step to v3, only remove 'target' as well as some other unused field