diff --git a/projects/player/src/app/services/unit-state-element-mapper.service.ts b/projects/player/src/app/services/unit-state-element-mapper.service.ts
index 84a70990b80ceb0f4281c1ba03012e41349be7b9..bc6a50f667f1e189e891bdd004ddf7fd1d37afd7 100644
--- a/projects/player/src/app/services/unit-state-element-mapper.service.ts
+++ b/projects/player/src/app/services/unit-state-element-mapper.service.ts
@@ -1,13 +1,9 @@
 import { Injectable } from '@angular/core';
-import { UnitStateElementCode } from '../models/verona';
 import { TextMarker } from '../classes/text-marker';
 import { Unit } from '../../../../common/interfaces/unit';
 import {
-  AudioElement, DragNDropValueObject, DropListElement,
-  ImageElement, InputElement,
-  InputElementValue, TextElement,
-  UIElement, UIElementType,
-  VideoElement
+  AudioElement, DragNDropValueObject, InputElement, InputElementValue,
+  TextElement, UIElement, UIElementType, VideoElement
 } from '../../../../common/interfaces/elements';
 import { UnitUtils } from '../../../../common/util/unit-utils';
 
@@ -21,62 +17,11 @@ export class UnitStateElementMapperService {
     this.dropListValueIds = UnitUtils.findUIElements(unitDefinition.pages, 'drop-list')
       .reduce(
         (accumulator: DragNDropValueObject[], currentValue: UIElement) => (
-          (currentValue.value && (currentValue.value as DragNDropValueObject[]).length) ? accumulator.concat(currentValue.value as DragNDropValueObject) : accumulator), []
+          (currentValue.value && (currentValue.value as DragNDropValueObject[]).length) ?
+            accumulator.concat(currentValue.value as DragNDropValueObject) : accumulator), []
       );
   }
 
-  // mapToElementValue(
-  //   elementModel: UIElement,
-  //   unitStateElement: UnitStateElementCode | undefined
-  // ): UIElement {
-  //   if (unitStateElement && unitStateElement.value !== undefined) {
-  //     switch (elementModel.type) {
-  //       case 'text':
-  //         elementModel.text = TextMarker
-  //           .restoreMarkings(unitStateElement.value as string[], (elementModel as TextElement).text);
-  //         break;
-  //       case 'image':
-  //         elementModel.magnifierUsed = unitStateElement.value;
-  //         break;
-  //       case 'video':
-  //       case 'audio':
-  //         if (elementModel && elementModel.playerProps) {
-  //           elementModel.playerProps.playbackTime = unitStateElement.value as number;
-  //         }
-  //         break;
-  //       case 'drop-list':
-  //         (elementModel as DropListElement).value = (unitStateElement.value as string[])
-  //           .map(id => this.getDropListValueById(id)) as DragNDropValueObject[];
-  //         break;
-  //       default:
-  //         elementModel.value = unitStateElement.value;
-  //     }
-  //   }
-  //   return elementModel;
-  // }
-  //
-  // mapToUnitStateValue = (elementModel: UIElement, unitStateElement: UnitStateElementCode | undefined):
-  // { id: string, value: InputElementValue } => {
-  //   switch (elementModel.type) {
-  //     case 'text':
-  //       return { id: elementModel.id, value: unitStateElement?.value || [] };
-  //     case 'image':
-  //       return { id: elementModel.id, value: (elementModel as ImageElement).magnifierUsed };
-  //     case 'video':
-  //       return { id: elementModel.id, value: (elementModel as VideoElement).playerProps.playbackTime };
-  //     case 'audio':
-  //       return { id: elementModel.id, value: (elementModel as AudioElement).playerProps.playbackTime };
-  //     case 'drop-list':
-  //       return {
-  //         id: elementModel.id,
-  //         value: ((elementModel as DropListElement).value as DragNDropValueObject[])
-  //           .map(element => element.id)
-  //       };
-  //     default:
-  //       return { id: elementModel.id, value: (elementModel as InputElement).value };
-  //   }
-  // };
-
   fromUnitState = (unitStateValue: InputElementValue | undefined, elementModel: UIElement): InputElementValue => {
     switch (elementModel.type) {
       case 'drop-list':