diff --git a/service/src/main/java/lcsb/mapviewer/services/interfaces/ICommentService.java b/service/src/main/java/lcsb/mapviewer/services/interfaces/ICommentService.java
index 43708ab53c684f8cd4ae00857ac711b7aaa90715..554da7657e36b5fbbfa7ed416855614d6a34364a 100644
--- a/service/src/main/java/lcsb/mapviewer/services/interfaces/ICommentService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/interfaces/ICommentService.java
@@ -10,8 +10,6 @@ import lcsb.mapviewer.model.map.model.ModelData;
 import lcsb.mapviewer.model.user.User;
 import lcsb.mapviewer.services.SecurityException;
 import lcsb.mapviewer.services.UserAccessException;
-import lcsb.mapviewer.services.search.ElementIdentifierDetails;
-import lcsb.mapviewer.services.search.data.ElementIdentifier;
 
 /**
  * Service responsible for comments functionality.
diff --git a/service/src/main/java/lcsb/mapviewer/services/search/ElementIdentifierDetails.java b/service/src/main/java/lcsb/mapviewer/services/search/ElementIdentifierDetails.java
deleted file mode 100644
index 3607fee90cf440838212776ba5dc740d91b41e5e..0000000000000000000000000000000000000000
--- a/service/src/main/java/lcsb/mapviewer/services/search/ElementIdentifierDetails.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package lcsb.mapviewer.services.search;
-
-import java.io.Serializable;
-
-/**
- * Class with detailed information about elements for specific search result.
- * 
- * @author Piotr Gawron
- *
- */
-public abstract class ElementIdentifierDetails implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-}
diff --git a/service/src/main/java/lcsb/mapviewer/services/search/comment/CommentDetails.java b/service/src/main/java/lcsb/mapviewer/services/search/comment/CommentDetails.java
deleted file mode 100644
index 87315d0d248f888326842739a830ac5f9612559c..0000000000000000000000000000000000000000
--- a/service/src/main/java/lcsb/mapviewer/services/search/comment/CommentDetails.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package lcsb.mapviewer.services.search.comment;
-
-import lcsb.mapviewer.model.map.Comment;
-import lcsb.mapviewer.services.search.ElementIdentifierDetails;
-
-/**
- * Class with detailed information about element comments.
- * 
- * @author Piotr Gawron
- *
- */
-public class CommentDetails extends ElementIdentifierDetails {
-
-	/**
-	 * 
-	 */
-	private static final long	serialVersionUID = 1L;
-
-	/**
-	 * Identifier of the comment.
-	 */
-	private String						commentId;
-
-	/**
-	 * Content of the comment.
-	 */
-	private String						commentContent;
-
-	/**
-	 * Default constructor.
-	 * 
-	 * @param id
-	 *          {@link #commentId}
-	 * @param content
-	 *          {@link #commentContent}
-	 */
-	public CommentDetails(String id, String content) {
-		this.commentId = id;
-		this.commentContent = content;
-	}
-
-	/**
-	 * Default constructor.
-	 * 
-	 * @param comment
-	 *          comment with detailed information
-	 */
-	public CommentDetails(Comment comment) {
-		commentId = comment.getId() + "";
-		commentContent = comment.getContent();
-	}
-
-	/**
-	 * @return the commentId
-	 * @see #commentId
-	 */
-	public String getCommentId() {
-		return commentId;
-	}
-
-	/**
-	 * @param commentId
-	 *          the commentId to set
-	 * @see #commentId
-	 */
-	public void setCommentId(String commentId) {
-		this.commentId = commentId;
-	}
-
-	/**
-	 * @return the commentContent
-	 * @see #commentContent
-	 */
-	public String getCommentContent() {
-		return commentContent;
-	}
-
-	/**
-	 * @param commentContent
-	 *          the commentContent to set
-	 * @see #commentContent
-	 */
-	public void setCommentContent(String commentContent) {
-		this.commentContent = commentContent;
-	}
-
-}
diff --git a/service/src/test/java/lcsb/mapviewer/services/search/AllSearchTests.java b/service/src/test/java/lcsb/mapviewer/services/search/AllSearchTests.java
index 512a3b462cb76482a560273f03114acb946038b1..a3092af48cd13004aa392f8a5cf2f34cc9add511 100644
--- a/service/src/test/java/lcsb/mapviewer/services/search/AllSearchTests.java
+++ b/service/src/test/java/lcsb/mapviewer/services/search/AllSearchTests.java
@@ -4,17 +4,15 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import lcsb.mapviewer.services.search.comment.AllCommentTests;
 import lcsb.mapviewer.services.search.data.AllSearchDataTests;
 import lcsb.mapviewer.services.search.db.AllSearchDbTests;
 import lcsb.mapviewer.services.search.layout.AllSearchLayoutTests;
 
 @RunWith(Suite.class)
-@SuiteClasses({ AllCommentTests.class, //
-		AllSearchDbTests.class, //
-		AllSearchDataTests.class, //
-		AllSearchLayoutTests.class, //
-		ElementMatcherTest.class, //
+@SuiteClasses({ AllSearchDbTests.class, //
+    AllSearchDataTests.class, //
+    AllSearchLayoutTests.class, //
+    ElementMatcherTest.class, //
 })
 public class AllSearchTests {
 
diff --git a/service/src/test/java/lcsb/mapviewer/services/search/comment/AllCommentTests.java b/service/src/test/java/lcsb/mapviewer/services/search/comment/AllCommentTests.java
deleted file mode 100644
index 1ea92dabc6a081556c202035f4eab2a163185cca..0000000000000000000000000000000000000000
--- a/service/src/test/java/lcsb/mapviewer/services/search/comment/AllCommentTests.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package lcsb.mapviewer.services.search.comment;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({ CommentDetailsTest.class })
-public class AllCommentTests {
-
-}
diff --git a/service/src/test/java/lcsb/mapviewer/services/search/comment/CommentDetailsTest.java b/service/src/test/java/lcsb/mapviewer/services/search/comment/CommentDetailsTest.java
deleted file mode 100644
index 538653fe471e57736e459c65f3ec0e7695d191ff..0000000000000000000000000000000000000000
--- a/service/src/test/java/lcsb/mapviewer/services/search/comment/CommentDetailsTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package lcsb.mapviewer.services.search.comment;
-
-import java.awt.geom.Point2D;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import lcsb.mapviewer.model.map.Comment;
-import lcsb.mapviewer.model.map.model.ModelData;
-
-public class CommentDetailsTest {
-
-	@Before
-	public void setUp() throws Exception {
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
-
-	@Test
-	public void testSerialization() {
-		try {
-			Comment comment = new Comment();
-			comment.setCoordinates(new Point2D.Double());
-			comment.setSubmodelData(new ModelData());
-			
-			SerializationUtils.serialize(new CommentDetails(comment));
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw e;
-		}
-	}
-
-}