diff --git a/Telegram/SourceFiles/core/utils.h b/Telegram/SourceFiles/core/utils.h
index 17a224689..96e7e9283 100644
--- a/Telegram/SourceFiles/core/utils.h
+++ b/Telegram/SourceFiles/core/utils.h
@@ -109,31 +109,6 @@ inline constexpr D up_cast(T object) {
 	return internal::up_cast_helper<D>(std::integral_constant<bool, std::is_base_of<DV, TV>::value || std::is_same<DV, TV>::value>(), object);
 }
 
-template <typename Lambda>
-class scope_guard_helper {
-public:
-	scope_guard_helper(Lambda on_scope_exit) : _handler(std::move(on_scope_exit)) {
-	}
-	void dismiss() {
-		_dismissed = true;
-	}
-	~scope_guard_helper() {
-		if (!_dismissed) {
-			_handler();
-		}
-	}
-
-private:
-	Lambda _handler;
-	bool _dismissed = false;
-
-};
-
-template <typename Lambda>
-scope_guard_helper<Lambda> scope_guard(Lambda on_scope_exit) {
-	return scope_guard_helper<Lambda>(std::move(on_scope_exit));
-}
-
 template <typename Container, typename T>
 inline bool contains(const Container &container, const T &value) {
 	auto end = std::end(container);
diff --git a/Telegram/SourceFiles/intro/introwidget.cpp b/Telegram/SourceFiles/intro/introwidget.cpp
index 9152d2e70..dddb498f6 100644
--- a/Telegram/SourceFiles/intro/introwidget.cpp
+++ b/Telegram/SourceFiles/intro/introwidget.cpp
@@ -538,12 +538,11 @@ bool Widget::Step::paintAnimated(Painter &p, QRect clip) {
 		return true;
 	}
 
-	auto guard = base::scope_guard([this, &p] {
-		if (hasCover()) paintCover(p, 0);
-	});
-
 	auto dt = _a_show.current(getms(), 1.);
 	if (!_a_show.animating()) {
+		if (hasCover()) {
+			paintCover(p, 0);
+		}
 		if (_coverAnimation.title) {
 			showFinished();
 		}
@@ -561,7 +560,6 @@ bool Widget::Step::paintAnimated(Painter &p, QRect clip) {
 	auto coverTop = (hasCover() ? anim::interpolate(-st::introCoverHeight, 0, showCoverMethod) : anim::interpolate(0, -st::introCoverHeight, hideCoverMethod));
 
 	paintCover(p, coverTop);
-	guard.dismiss();
 
 	auto positionReady = hasCover() ? showCoverMethod : hideCoverMethod;
 	_coverAnimation.title->paintFrame(p, positionReady, departingAlpha, arrivingAlpha);
diff --git a/Telegram/SourceFiles/layerwidget.cpp b/Telegram/SourceFiles/layerwidget.cpp
index 35d37fb67..7a503d83c 100644
--- a/Telegram/SourceFiles/layerwidget.cpp
+++ b/Telegram/SourceFiles/layerwidget.cpp
@@ -186,7 +186,7 @@ void LayerStackWidget::BackgroundWidget::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	_inPaintEvent = true;
-	auto guard = base::scope_guard([this] {
+	auto guard = gsl::finally([this] {
 		_inPaintEvent = false;
 		checkIfDone();
 	});
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 25ded0100..55b49fe02 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -247,7 +247,7 @@ QString GetServerName() {
 	}
 
 	gchar *name = nullptr;
-	auto guard = base::scope_guard([&name] {
+	auto guard = gsl::finally([&name] {
 		if (name) Libs::g_free(name);
 	});
 
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp
index 0fe024087..45d58237a 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@@ -659,7 +659,7 @@ int32 MainWindow::screenNameChecksum(const QString &name) const {
 
 void MainWindow::psRefreshTaskbarIcon() {
 	auto refresher = object_ptr<QWidget>(this);
-	auto guard = base::scope_guard([&refresher] {
+	auto guard = gsl::finally([&refresher] {
 		refresher.destroy();
 	});
 	refresher->setWindowFlags(static_cast<Qt::WindowFlags>(Qt::Tool) | Qt::FramelessWindowHint);
diff --git a/Telegram/SourceFiles/settings/settings_scale_widget.cpp b/Telegram/SourceFiles/settings/settings_scale_widget.cpp
index 02e96dd28..698b76e7a 100644
--- a/Telegram/SourceFiles/settings/settings_scale_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_scale_widget.cpp
@@ -83,7 +83,7 @@ void ScaleWidget::onAutoChanged() {
 void ScaleWidget::setScale(DBIScale newScale) {
 	if (_inSetScale) return;
 	_inSetScale = true;
-	auto guard = base::scope_guard([this] { _inSetScale = false; });
+	auto guard = gsl::finally([this] { _inSetScale = false; });
 
 	if (newScale == cScreenScale()) newScale = dbisAuto;
 	if (newScale == dbisAuto && !_auto->checked()) {
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index 85ea96e53..df18ecd5f 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -176,7 +176,7 @@ void Manager::stopAllHiding() {
 }
 
 void Manager::showNextFromQueue() {
-	auto guard = base::scope_guard([this] {
+	auto guard = gsl::finally([this] {
 		if (_positionsOutdated) {
 			moveWidgets();
 		}