diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c
index ae2b7705f7b..fc7bb7ad863 100644
--- a/dlls/ntdll/loadorder.c
+++ b/dlls/ntdll/loadorder.c
@@ -473,10 +473,8 @@ static BOOL get_registry_value( HKEY hkey, const WCHAR *module, enum loadorder_t
 /***************************************************************************
  *	MODULE_GetLoadOrderW	(internal)
  *
- * Locate the loadorder of a module.
- * Any path is stripped from the path-argument and so are the extension
- * '.dll' and '.exe'. A lookup in the table can yield an override for
- * the specific dll. Otherwise the default load order is returned.
+ * Return the loadorder of a module.
+ * The system directory and '.dll' extension is stripped from the path.
  */
 void MODULE_GetLoadOrderW( enum loadorder_type loadorder[], const WCHAR *app_name,
                           const WCHAR *path )
diff --git a/dlls/user/msgbox.c b/dlls/user/msgbox.c
index fbacf09cff5..483f89574ea 100644
--- a/dlls/user/msgbox.c
+++ b/dlls/user/msgbox.c
@@ -346,10 +346,6 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
 
 /**************************************************************************
  *		MessageBoxA (USER32.@)
- *
- * NOTES
- *   The WARN is here to help debug erroneous MessageBoxes
- *   Use: WINEDEBUG=warn+dialog,+relay
  */
 INT WINAPI MessageBoxA(HWND hWnd, LPCSTR text, LPCSTR title, UINT type)
 {
diff --git a/dlls/user/nonclient.c b/dlls/user/nonclient.c
index 9f3d2513f8f..9200572df6a 100644
--- a/dlls/user/nonclient.c
+++ b/dlls/user/nonclient.c
@@ -88,8 +88,8 @@ static const BYTE lpGrayMask[] = { 0xAA, 0xA0,
  * Computes the size of the "outside" parts of the window based on the
  * parameters of the client area.
  *
- + PARAMS
- *     LPRECT16  rect
+ * PARAMS
+ *     LPRECT  rect
  *     DWORD  style
  *     BOOL  menu
  *     DWORD  exStyle
@@ -144,8 +144,8 @@ NC_AdjustRectOuter (LPRECT rect, DWORD style, BOOL menu, DWORD exStyle)
  * Computes the size of the "inside" part of the window based on the
  * parameters of the client area.
  *
- + PARAMS
- *     LPRECT16 rect
+ * PARAMS
+ *     LPRECT   rect
  *     DWORD    style
  *     DWORD    exStyle
  *
diff --git a/dlls/user/text.c b/dlls/user/text.c
index 6c0274738c4..a39e47cfb03 100644
--- a/dlls/user/text.c
+++ b/dlls/user/text.c
@@ -1105,13 +1105,6 @@ static BOOL CALLBACK gray_string_callbackW( HDC hdc, LPARAM param, INT len )
 
 /***********************************************************************
  *           TEXT_GrayString
- *
- * FIXME: The call to 16-bit code only works because the wine GDI is a 16-bit
- * heap and we can guarantee that the handles fit in an INT16. We have to
- * rethink the strategy once the migration to NT handles is complete.
- * We are going to get a lot of code-duplication once this migration is
- * completed...
- *
  */
 static BOOL TEXT_GrayString(HDC hdc, HBRUSH hb, GRAYSTRINGPROC fn, LPARAM lp, INT len,
                             INT x, INT y, INT cx, INT cy )