diff --git a/asibfm700/asibfm700_netserver.cpp b/asibfm700/asibfm700_netserver.cpp
index e38309c..82e4e04 100644
--- a/asibfm700/asibfm700_netserver.cpp
+++ b/asibfm700/asibfm700_netserver.cpp
@@ -4,7 +4,6 @@
 namespace asibfm700
 {
 
-template <mcc::traits::mcc_range_of_input_char_range R>
 Asibfm700MountNetServer::Asibfm700MountNetServer(asio::io_context& ctx,
                                                  Asibfm700Mount& mount,
                                                  std::shared_ptr<spdlog::logger> logger)
diff --git a/asibfm700/asibfm700_netserver.h b/asibfm700/asibfm700_netserver.h
index 1b61fca..a5d1ce6 100644
--- a/asibfm700/asibfm700_netserver.h
+++ b/asibfm700/asibfm700_netserver.h
@@ -138,7 +138,6 @@ class Asibfm700MountNetServer : public mcc::network::MccGenericMountNetworkServe
     using base_t = mcc::network::MccGenericMountNetworkServer<Asibfm700Logger>;
 
 public:
-    template <mcc::traits::mcc_range_of_input_char_range R = decltype(Asibfm700Logger::LOGGER_DEFAULT_FORMAT)>
     Asibfm700MountNetServer(asio::io_context& ctx, Asibfm700Mount& mount, std::shared_ptr<spdlog::logger> logger);
 
     ~Asibfm700MountNetServer();
diff --git a/asibfm700/asibfm700_servocontroller.h b/asibfm700/asibfm700_servocontroller.h
index 1374374..2b23874 100644
--- a/asibfm700/asibfm700_servocontroller.h
+++ b/asibfm700/asibfm700_servocontroller.h
@@ -105,8 +105,8 @@ public:
     AsibFM700ServoController(const AsibFM700ServoController&) = delete;
     AsibFM700ServoController& operator=(const AsibFM700ServoController&) = delete;
 
-    AsibFM700ServoController(AsibFM700ServoController&&);
-    AsibFM700ServoController& operator=(AsibFM700ServoController&&);
+    AsibFM700ServoController(AsibFM700ServoController&&) = default;
+    AsibFM700ServoController& operator=(AsibFM700ServoController&&) = default;
 
     ~AsibFM700ServoController();
 
diff --git a/mcc/mcc_finite_state_machine.h b/mcc/mcc_finite_state_machine.h
index aa8aa44..5395796 100644
--- a/mcc/mcc_finite_state_machine.h
+++ b/mcc/mcc_finite_state_machine.h
@@ -396,10 +396,6 @@ public:
                           [p_event, states, currentState, this]<traits::fsm_state_c curr_state_t>(curr_state_t*) {
                               using to_state_t = curr_state_t::transition_t::template find_state_by_event_t<EvT>;
 
-                              if (std::holds_alternative<to_state_t>(*currentState)) {
-                                  // ?!!!!  from self
-                              }
-
                               if constexpr (!std::is_void_v<to_state_t>) {
                                   std::lock_guard lock(_transitionMutex);