diff --git a/src/main/java/org/sadtech/bot/core/domain/BoxAnswer.java b/src/main/java/org/sadtech/bot/core/domain/BoxAnswer.java
index 968965a..e944b40 100644
--- a/src/main/java/org/sadtech/bot/core/domain/BoxAnswer.java
+++ b/src/main/java/org/sadtech/bot/core/domain/BoxAnswer.java
@@ -65,7 +65,7 @@ public class BoxAnswer {
         this.stickerId = stickerId;
     }
 
-    public BoxAnswer clone() {
+    public BoxAnswer prototype() {
         return new BoxAnswer(this);
     }
 
diff --git a/src/main/java/org/sadtech/bot/core/domain/Comment.java b/src/main/java/org/sadtech/bot/core/domain/Comment.java
deleted file mode 100644
index 40cc584..0000000
--- a/src/main/java/org/sadtech/bot/core/domain/Comment.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.sadtech.bot.core.domain;
-
-//@TODO: Дописать класс
-public class Comment extends Content {
-
-    private Integer postId;
-    private String text;
-    private Integer data;
-
-    public Comment() {
-
-    }
-
-}
diff --git a/src/main/java/org/sadtech/bot/core/domain/Mail.java b/src/main/java/org/sadtech/bot/core/domain/Mail.java
index 2e06d0b..0f5e67e 100644
--- a/src/main/java/org/sadtech/bot/core/domain/Mail.java
+++ b/src/main/java/org/sadtech/bot/core/domain/Mail.java
@@ -44,7 +44,7 @@ public class Mail extends Content {
         this.message = message;
     }
 
-    public Mail clone() {
+    public Mail prototype() {
         return new Mail(this);
     }
 
diff --git a/src/main/java/org/sadtech/bot/core/repository/CommentRepository.java b/src/main/java/org/sadtech/bot/core/repository/CommentRepository.java
deleted file mode 100644
index 0f9c995..0000000
--- a/src/main/java/org/sadtech/bot/core/repository/CommentRepository.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.sadtech.bot.core.repository;
-
-import org.sadtech.bot.core.domain.Comment;
-
-public interface CommentRepository {
-
-    void add(Comment comment);
-
-}
diff --git a/src/main/java/org/sadtech/bot/core/repository/impl/CommentRepositoryList.java b/src/main/java/org/sadtech/bot/core/repository/impl/CommentRepositoryList.java
deleted file mode 100644
index f9cf34e..0000000
--- a/src/main/java/org/sadtech/bot/core/repository/impl/CommentRepositoryList.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.sadtech.bot.core.repository.impl;
-
-import org.sadtech.bot.core.domain.Comment;
-import org.sadtech.bot.core.repository.CommentRepository;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CommentRepositoryList implements CommentRepository {
-
-    private List<Comment> comments = new ArrayList<>();
-
-    @Override
-    public void add(Comment comment) {
-        comments.add(comment);
-    }
-}