diff --git a/README.md b/README.md
index 9b709b4..d9f8776 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,14 @@
 [x] Config file support
 [x] TCP support w/ TLS
 [x] HTTP support w/ TLS
-[] Ping/Pong
+[x] Ping/Pong
 [] String support
 [] List support
 [] Set support
 [] Sorted set support
 [] Hash support
 [] Stream support
+[] Pub/Sub support
 
 [] RediSearch support
 [] RedisJSON support
@@ -19,4 +20,5 @@
 [] Bitmap support
 [] Bitfield support
 
-[] Add support for multiple root CAs on client side
\ No newline at end of file
+[] Support for multiple root CAs on client side
+[] Clustering support
\ No newline at end of file
diff --git a/serialization/encode.go b/serialization/encode.go
index a830c07..30b91e8 100644
--- a/serialization/encode.go
+++ b/serialization/encode.go
@@ -33,7 +33,6 @@ func encodeSimpleString(wr *resp.Writer, tokens []string) error {
 	default:
 		return fmt.Errorf(wrong_args_error, strings.ToUpper(tokens[0]))
 	case 2:
-		fmt.Println(tokens[0], tokens[1])
 		wr.WriteSimpleString(tokens[1])
 		return nil
 	}
diff --git a/server/main.go b/server/main.go
index bdd6807..db991fd 100644
--- a/server/main.go
+++ b/server/main.go
@@ -43,7 +43,6 @@ func (server *Server) handleConnection(conn net.Conn) {
 		if cmd, err := serialization.Decode(message); err != nil {
 			// Return error to client
 			serialization.Encode(connRW, fmt.Sprintf("Error %s", err.Error()))
-			fmt.Println("Server: ", err)
 			continue
 		} else {
 			// Return encoded message to client