diff --git a/README.md b/README.md
index 23fd22ab..4958b1a0 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Library for creating terminal applications with text-based widgets
 
-The FINAL CUT is a C++ class library and widget toolkit with full [mouse](doc/mouse-control.md#title-bar-actions-on-mouse-clicks) support for creating a [text-based user interface](https://en.wikipedia.org/wiki/Text-based_user_interface). The library supports the programmer to develop an application for the text console. It allows the simultaneous handling of multiple text windows on the screen.
+FINAL CUT is a C++ class library and widget toolkit with full [mouse](doc/mouse-control.md#title-bar-actions-on-mouse-clicks) support for creating a [text-based user interface](https://en.wikipedia.org/wiki/Text-based_user_interface). The library supports the programmer to develop an application for the text console. It allows the simultaneous handling of multiple text windows on the screen.
 
 The structure of the Qt framework was originally the inspiration for the C++ class design of FINAL CUT. It provides common controls like dialog boxes, push buttons, check boxes, radio buttons, input lines, list boxes, status bars and so on.
 
diff --git a/src/fmenuitem.cpp b/src/fmenuitem.cpp
index e0287873..bfd024ba 100644
--- a/src/fmenuitem.cpp
+++ b/src/fmenuitem.cpp
@@ -417,7 +417,6 @@ void FMenuItem::onAccel (FAccelEvent* ev)
 
     mbar->redraw();
     mbar->drop_down = true;
-
   }
   else
   {
diff --git a/src/fstring.cpp b/src/fstring.cpp
index 06814e2d..2b3234c3 100644
--- a/src/fstring.cpp
+++ b/src/fstring.cpp
@@ -342,12 +342,6 @@ const FString& FString::operator () () const
 
 
 // public methods of FString
-//----------------------------------------------------------------------
-std::size_t FString::getUTF8length() const
-{
-  return length;
-}
-
 //----------------------------------------------------------------------
 FString FString::clear()
 {
diff --git a/src/fvterm.cpp b/src/fvterm.cpp
index 14d8e1f0..8869239e 100644
--- a/src/fvterm.cpp
+++ b/src/fvterm.cpp
@@ -2245,18 +2245,18 @@ bool FVTerm::skipUnchangedCharacters (uInt& x, uInt xmax, uInt y) const
   // Skip characters without changes if it is faster than redrawing
 
   auto& vt = vterm;
-  auto print_char = &vt->data[y * uInt(vt->width) + x];
-  print_char->attr.bit.printed = true;
+  auto& print_char = vt->data[y * uInt(vt->width) + x];
+  print_char.attr.bit.printed = true;
 
-  if ( print_char->attr.bit.no_changes )
+  if ( print_char.attr.bit.no_changes )
   {
     uInt count{1};
 
     for (uInt i = x + 1; i <= xmax; i++)
     {
-      auto ch = &vt->data[y * uInt(vt->width) + i];
+      auto& ch = vt->data[y * uInt(vt->width) + i];
 
-      if ( ch->attr.bit.no_changes )
+      if ( ch.attr.bit.no_changes )
         count++;
       else
         break;
diff --git a/src/include/final/fstring.h b/src/include/final/fstring.h
index faa4da4c..8a1bf59d 100644
--- a/src/include/final/fstring.h
+++ b/src/include/final/fstring.h
@@ -171,7 +171,6 @@ class FString
 
     // Methods
     std::size_t getLength() const;
-    std::size_t getUTF8length() const;
     std::size_t capacity() const;
 
     iterator begin();
diff --git a/src/include/final/fwidget.h b/src/include/final/fwidget.h
index 493d6703..c482b8ef 100644
--- a/src/include/final/fwidget.h
+++ b/src/include/final/fwidget.h
@@ -107,12 +107,6 @@
 #include "final/ftypes.h"
 #include "final/fvterm.h"
 
-// Old callback macros (deprecated)
-#define F_FUNCTION_CALLBACK(h)  (h), this, nullptr
-#define F_FUNCTION_CALLBACK_DATA(h)  (h), this
-#define F_METHOD_CALLBACK(i,h)  (i), (h), this, nullptr
-#define F_METHOD_CALLBACK_DATA(i,h)  (i), (h), this
-
 namespace finalcut
 {