DDBNEXT-557: remove unneeded classes
DDBNEXT-557: wip
DDBNEXT-557: add new domain object and test