diff --git a/packages/stream_chat_flutter_core/lib/src/channel_list_core.dart b/packages/stream_chat_flutter_core/lib/src/channel_list_core.dart
index 94ca0525..d60292d1 100644
--- a/packages/stream_chat_flutter_core/lib/src/channel_list_core.dart
+++ b/packages/stream_chat_flutter_core/lib/src/channel_list_core.dart
@@ -11,7 +11,6 @@ import 'stream_chat_core.dart';
 /// [ChannelListCore] is a simplified class that allows fetching a list of channels while exposing UI builders.
 /// A [ChannelListController] is used to reload and paginate data.
 ///
-/// {@tool snippet}
 ///
 /// ```dart
 /// class ChannelListPage extends StatelessWidget {
@@ -51,7 +50,6 @@ import 'stream_chat_core.dart';
 ///   }
 /// }
 /// ```
-/// {@end-tool}
 ///
 /// Make sure to have a [StreamChatCore] ancestor in order to provide the information about the channels.
 class ChannelListCore extends StatefulWidget {
diff --git a/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart b/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart
index 5b64bd8c..cfdfb0ae 100644
--- a/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart
+++ b/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart
@@ -8,8 +8,6 @@ import 'message_search_bloc.dart';
 /// [MessageSearchListCore] is a simplified class that allows searching for messages across channels while exposing UI builders.
 /// A [MessageSearchListController] is used to load and paginate data.
 ///
-/// {@tool snippet}
-///
 /// ```dart
 /// class MessageSearchPage extends StatelessWidget {
 ///   @override
@@ -28,7 +26,6 @@ import 'message_search_bloc.dart';
 ///   }
 /// }
 /// ```
-/// {@end-tool}
 ///
 /// Make sure to have a [MessageSearchBloc] ancestor in order to provide the information about the messages.
 /// The widget uses a [ListView.separated] to render the list of messages.
diff --git a/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart b/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart
index c98ef7c9..3d23eb08 100644
--- a/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart
+++ b/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart
@@ -11,8 +11,6 @@ import 'package:stream_chat/stream_chat.dart';
 ///
 /// Conversely, when app is resumed or restarted, a new connection is initiated.
 ///
-/// {@tool snippet}
-///
 /// ```dart
 /// class MyApp extends StatelessWidget {
 ///   final Client client;
@@ -32,7 +30,6 @@ import 'package:stream_chat/stream_chat.dart';
 ///   }
 /// }
 /// ```
-/// {@end-tool}
 ///
 class StreamChatCore extends StatefulWidget {
   /// Instance of Stream Chat Client containing information about the current
diff --git a/packages/stream_chat_flutter_core/lib/src/user_list_core.dart b/packages/stream_chat_flutter_core/lib/src/user_list_core.dart
index 3d0981af..a9398d89 100644
--- a/packages/stream_chat_flutter_core/lib/src/user_list_core.dart
+++ b/packages/stream_chat_flutter_core/lib/src/user_list_core.dart
@@ -8,8 +8,6 @@ import 'package:stream_chat_flutter_core/src/users_bloc.dart';
 /// [UserListCore] is a simplified class that allows fetching users while exposing UI builders.
 /// A [UserListController] is used to load and paginate data.
 ///
-/// {@tool snippet}
-///
 /// ```dart
 /// class UsersListPage extends StatelessWidget {
 ///   @override
@@ -48,7 +46,6 @@ import 'package:stream_chat_flutter_core/src/users_bloc.dart';
 ///   }
 /// }
 /// ```
-/// {@end-tool}
 ///
 /// [UsersBloc] must be the ancestor of this widget. This is necessary since
 /// [UserListCore] depends on functionality contained within [UsersBloc].