diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index 47d43440..32689aa6 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -255,33 +255,12 @@ class _MessageWidgetState extends State<MessageWidget>
               if (attachmentBuilder == null) {
                 return SizedBox();
               }
+
               attachmentWidget = attachmentBuilder(
                 context,
                 widget.message,
                 attachment,
               );
-//              if (attachment.type == 'video') {
-//                attachmentWidget = VideoAttachment(
-//                  attachment: attachment,
-//                  messageTheme: _messageTheme,
-//                  enableFullScreen: widget.showVideoFullScreen,
-//                );
-//              } else if (attachment.type == 'giphy') {
-//                attachmentWidget = GiphyAttachment(
-//                  attachment: attachment,
-//                  message: widget.message,
-//                  messageTheme: _messageTheme,
-//                );
-//              } else if (attachment.type == 'image') {
-//                attachmentWidget = ImageAttachment(
-//                  attachment: attachment,
-//                  messageTheme: _messageTheme,
-//                );
-//              } else if (attachment.type == 'file') {
-//                attachmentWidget = FileAttachment(
-//                  attachment: attachment,
-//                );
-//              }
 
               if (attachmentWidget != null) {
                 return _buildAttachment(