diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index fed0e6069..41b37a17e 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -351,7 +351,9 @@ private:
 	void continueSave();
 	void cancelSave();
 
+#if 0 // Enable after design improvements.
 	void toggleBotManager(const QString &command);
+#endif
 
 	void togglePreHistoryHidden(
 		not_null<ChannelData*> channel,
@@ -1395,7 +1397,7 @@ void Controller::fillBotUsernamesButton() {
 			: tr::lng_manage_peer_bot_public_links();
 	}) | rpl::flatten_latest();
 
-	const auto wrap = _controls.buttonsLayout->add(
+	_controls.buttonsLayout->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			_controls.buttonsLayout,
 			object_ptr<Ui::VerticalLayout>(
@@ -1923,6 +1925,7 @@ void Controller::saveHistoryVisibility() {
 		[=] { cancelSave(); });
 }
 
+#if 0 // Enable after design improvements.
 void Controller::toggleBotManager(const QString &command) {
 	const auto controller = _navigation->parentController();
 	_api.request(MTPcontacts_ResolveUsername(
@@ -1938,6 +1941,7 @@ void Controller::toggleBotManager(const QString &command) {
 		}
 	}).send();
 }
+#endif
 
 void Controller::togglePreHistoryHidden(
 		not_null<ChannelData*> channel,
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 52c228f77..4314f48f2 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -189,7 +189,6 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 		}, lifetime());
 	}
 
-	const auto skip = st::normalFont->spacew * 4;
 	const auto titleWrap = _wrap->insert(
 		0,
 		object_ptr<FixedHeightWidget>(