* Remove "additional data" from entities * Fix merge issue --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk>