DDBNEXT-27: refactor code

  - remove unused data attributes
  - remove finished TODOs