diff --git a/chatto/src/main/java/org/ros/chatto/service/ChatService.java b/chatto/src/main/java/org/ros/chatto/service/ChatService.java
index 441f0a0..a5b2c44 100644
--- a/chatto/src/main/java/org/ros/chatto/service/ChatService.java
+++ b/chatto/src/main/java/org/ros/chatto/service/ChatService.java
@@ -6,14 +6,21 @@ import java.util.List;
 import org.ros.chatto.dto.ChatMessageDTO;
 import org.ros.chatto.dto.MessageCipherDTO;
 import org.ros.chatto.dto.ReencryptionDTO;
-import org.springframework.data.domain.PageRequest;
 
 public interface ChatService {
-	public ChatMessageDTO createMessage(String fromUser, String toUser, MessageCipherDTO messageCipherDTO);
+	public ChatMessageDTO createMessage(String fromUser, String toUser,
+			MessageCipherDTO messageCipherDTO);
+
 	public List<ChatMessageDTO> getAllMessages(String fromUser, String toUser);
-	public List<ChatMessageDTO> getMessagePage(String fromUser, String toUser, int page, int size);
-	public List<ChatMessageDTO> getNewMessages(String fromUser, String toUser, Date lastMessageTime);
+
+	public List<ChatMessageDTO> getMessagePage(String fromUser, String toUser,
+			int page, int size);
+
+	public List<ChatMessageDTO> getNewMessages(String fromUser, String toUser,
+			Date lastMessageTime);
+
 	public void reencryptMessages(List<ReencryptionDTO> reencryptionDTOs);
-	public List<ReencryptionDTO> getAllMessagesForReencryption(String fromUser, String toUser);
-	public List<ChatMessageDTO> getAllMessages(String name, String userName, PageRequest pageRequest);
+
+	public List<ReencryptionDTO> getAllMessagesForReencryption(String fromUser,
+			String toUser);
 }
diff --git a/chatto/src/main/java/org/ros/chatto/service/ChatServiceImpl.java b/chatto/src/main/java/org/ros/chatto/service/ChatServiceImpl.java
index 9666a7c..bf59ba9 100644
--- a/chatto/src/main/java/org/ros/chatto/service/ChatServiceImpl.java
+++ b/chatto/src/main/java/org/ros/chatto/service/ChatServiceImpl.java
@@ -102,10 +102,4 @@ public class ChatServiceImpl implements ChatService {
 		messageCipherRepository.saveAll(messageCiphers);
 	}
 
-	@Override
-	public List<ChatMessageDTO> getAllMessages(final String name,
-			final String userName, final PageRequest pageRequest) {
-		// TODO Auto-generated method stub
-		return null;
-	}
 }