diff --git a/lib/WebGUI/Help/AdSpace.pm b/lib/WebGUI/Help/AdSpace.pm
index 0c72979d3..7275dfe61 100644
--- a/lib/WebGUI/Help/AdSpace.pm
+++ b/lib/WebGUI/Help/AdSpace.pm
@@ -83,10 +83,6 @@ our $HELP = {
                                 tag => 'edit ad space',
                                 namespace => 'AdSpace',
                         },
-                        {
-                                tag => 'ad space',
-                                namespace => 'Macro_AdSpace',
-                        },
                 ],
 	},
 
diff --git a/lib/WebGUI/Help/Asset.pm b/lib/WebGUI/Help/Asset.pm
index 209e052db..3f4c8fcbe 100644
--- a/lib/WebGUI/Help/Asset.pm
+++ b/lib/WebGUI/Help/Asset.pm
@@ -435,14 +435,6 @@ our $HELP = {
 				tag => 'metadata edit property',
 				namespace => 'Asset'
 			},
-			{
-				tag => 'aoi hits',
-				namespace => 'Macro_AOIHits'
-			},
-			{
-				tag => 'aoi rank',
-				namespace => 'Macro_AOIRank'
-			},
 			{
 				tag => 'wobject add/edit',
 				namespace => 'Asset_Wobject',
@@ -451,9 +443,9 @@ our $HELP = {
 	},
 
 	'metadata edit property' => {
-                title => 'metadata edit property',
-                body => 'metadata edit property body',
-		fields => [
+        title => 'metadata edit property',
+        body => 'metadata edit property body',
+        fields => [
                         {
                                 title => 'Field name',
                                 description => 'Field Name description',
@@ -474,26 +466,18 @@ our $HELP = {
                                 description => 'Possible Values description',
                                 namespace => 'Asset',
                         },
-		],
-                related => [
-			{
-				tag => 'metadata manage',
-				namespace => 'Asset'
-                        },
-			{
-				tag => 'aoi hits',
-				namespace => 'Macro_AOIHits'
-			},
-			{
-				tag => 'aoi rank',
-				namespace => 'Macro_AOIRank'
-			},
-                        {
-                                tag => 'wobject add/edit',
-                                namespace => 'Asset_Wobject',
-                        },
-                ],
-        },
+        ],
+        related => [
+            {
+                tag => 'metadata manage',
+                namespace => 'Asset'
+            },
+            {
+                tag => 'wobject add/edit',
+                namespace => 'Asset_Wobject',
+            },
+        ],
+    },
 
 	'manage versions' => {
 		title => 'committed versions',
diff --git a/lib/WebGUI/Help/Asset_Wobject.pm b/lib/WebGUI/Help/Asset_Wobject.pm
index 0404d7cda..9c722370d 100644
--- a/lib/WebGUI/Help/Asset_Wobject.pm
+++ b/lib/WebGUI/Help/Asset_Wobject.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 			{
 				tag => 'style sheets using',
 				namespace => 'WebGUI'
diff --git a/lib/WebGUI/Help/Macro_AOIHits.pm b/lib/WebGUI/Help/Macro_AOIHits.pm
deleted file mode 100644
index 026c75deb..000000000
--- a/lib/WebGUI/Help/Macro_AOIHits.pm
+++ /dev/null
@@ -1,32 +0,0 @@
-package WebGUI::Help::Macro_AOIHits;
-
-our $HELP = {
-
-        'aoi hits' => {
-		title => 'aoi hits title',
-		body => 'aoi hits body',
-		fields => [
-		],
-		related => [
-			{
-				tag => 'metadata manage',
-				namespace => 'Asset'
-			},
-			{
-				tag => 'settings',
-				namespace => 'WebGUI'
-			},
-			{
-				tag => 'aoi rank',
-				namespace => 'Macro_AOIRank',
-			},
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
-		]
-	},
-
-};
-
-1;
diff --git a/lib/WebGUI/Help/Macro_AOIRank.pm b/lib/WebGUI/Help/Macro_AOIRank.pm
deleted file mode 100644
index ff5d5510d..000000000
--- a/lib/WebGUI/Help/Macro_AOIRank.pm
+++ /dev/null
@@ -1,32 +0,0 @@
-package WebGUI::Help::Macro_AOIRank;
-
-our $HELP = {
-
-        'aoi rank' => {
-		title => 'aoi rank title',
-		body => 'aoi rank body',
-		fields => [
-		],
-		related => [
-			{
-				tag => 'metadata manage',
-				namespace => 'Asset'
-			},
-			{
-				tag => 'settings',
-				namespace => 'WebGUI'
-			},
-			{
-				tag => 'aoi hits',
-				namespace => 'Macro_AOIHits',
-			},
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
-		]
-	},
-
-};
-
-1;
diff --git a/lib/WebGUI/Help/Macro_AdSpace.pm b/lib/WebGUI/Help/Macro_AdSpace.pm
deleted file mode 100644
index c2e956adb..000000000
--- a/lib/WebGUI/Help/Macro_AdSpace.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package WebGUI::Help::Macro_AdSpace;
-
-our $HELP = {  ##hashref of hashes
-	'ad space' => {
-		title => 'adspace title',  #The title and body are looked up in the
-		body => 'adspace body',	#i18n file of the same name
-		fields => [
-		],
-		related => [
-		],
-	},
-
-};
-
-1;
diff --git a/lib/WebGUI/Help/Macro_AdminBar.pm b/lib/WebGUI/Help/Macro_AdminBar.pm
index 25636cc6b..725d71ebd 100644
--- a/lib/WebGUI/Help/Macro_AdminBar.pm
+++ b/lib/WebGUI/Help/Macro_AdminBar.pm
@@ -2,9 +2,9 @@ package WebGUI::Help::Macro_AdminBar;
 
 our $HELP = {
 
-        'admin bar' => {
+    'admin bar' => {
 		title => 'admin bar title',
-		body => 'admin bar body',
+		body => '',
 		fields => [
 		],
 		variables => [
@@ -35,10 +35,6 @@ our $HELP = {
 		          }
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 			{
 				tag => 'template language',
 				namespace => 'Asset_Template'
diff --git a/lib/WebGUI/Help/Macro_AdminText.pm b/lib/WebGUI/Help/Macro_AdminText.pm
deleted file mode 100644
index f9c6580ea..000000000
--- a/lib/WebGUI/Help/Macro_AdminText.pm
+++ /dev/null
@@ -1,20 +0,0 @@
-package WebGUI::Help::Macro_AdminText;
-
-our $HELP = {
-
-        'admin text' => {
-		title => 'admin text title',
-		body => 'admin text body',
-		fields => [
-		],
-		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
-		]
-	},
-
-};
-
-1;
diff --git a/lib/WebGUI/Help/Macro_AdminToggle.pm b/lib/WebGUI/Help/Macro_AdminToggle.pm
index 1d3975639..ab025501f 100644
--- a/lib/WebGUI/Help/Macro_AdminToggle.pm
+++ b/lib/WebGUI/Help/Macro_AdminToggle.pm
@@ -4,7 +4,7 @@ our $HELP = {
 
         'admin toggle' => {
 		title => 'admin toggle title',
-		body => 'admin toggle body',
+		body => '',
 		variables => [
 		          {
 		            'name' => 'toggle.url'
@@ -16,10 +16,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 			{
 				tag => 'template language',
 				namespace => 'Asset_Template'
diff --git a/lib/WebGUI/Help/Macro_AssetProxy.pm b/lib/WebGUI/Help/Macro_AssetProxy.pm
deleted file mode 100644
index 67bc7f8a9..000000000
--- a/lib/WebGUI/Help/Macro_AssetProxy.pm
+++ /dev/null
@@ -1,24 +0,0 @@
-package WebGUI::Help::Macro_AssetProxy;
-
-our $HELP = {
-
-        'asset proxy' => {
-		title => 'asset proxy title',
-		body => 'asset proxy body',
-		fields => [
-		],
-		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
-			{
-				tag => 'shortcut add/edit',
-				namespace => 'Asset_Shortcut'
-			},
-		]
-	},
-
-};
-
-1;
diff --git a/lib/WebGUI/Help/Macro_At_username.pm b/lib/WebGUI/Help/Macro_At_username.pm
deleted file mode 100644
index 5d7405f7a..000000000
--- a/lib/WebGUI/Help/Macro_At_username.pm
+++ /dev/null
@@ -1,20 +0,0 @@
-package WebGUI::Help::Macro_At_username;
-
-our $HELP = {
-
-        'username' => {
-		title => 'username title',
-		body => 'username body',
-		fields => [
-		],
-		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
-		]
-	},
-
-};
-
-1;
diff --git a/lib/WebGUI/Help/Macro_CanEditText.pm b/lib/WebGUI/Help/Macro_CanEditText.pm
deleted file mode 100644
index c01e91bab..000000000
--- a/lib/WebGUI/Help/Macro_CanEditText.pm
+++ /dev/null
@@ -1,20 +0,0 @@
-package WebGUI::Help::Macro_CanEditText;
-
-our $HELP = {
-
-        'can edit text' => {
-		title => 'can edit text title',
-		body => 'can edit text body',
-		fields => [
-		],
-		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
-		]
-	},
-
-};
-
-1;
diff --git a/lib/WebGUI/Help/Macro_D_date.pm b/lib/WebGUI/Help/Macro_D_date.pm
index 45b7b8d30..6a84a3101 100644
--- a/lib/WebGUI/Help/Macro_D_date.pm
+++ b/lib/WebGUI/Help/Macro_D_date.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_EditableToggle.pm b/lib/WebGUI/Help/Macro_EditableToggle.pm
index b34da963d..0773ff2fe 100644
--- a/lib/WebGUI/Help/Macro_EditableToggle.pm
+++ b/lib/WebGUI/Help/Macro_EditableToggle.pm
@@ -16,10 +16,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_Env.pm b/lib/WebGUI/Help/Macro_Env.pm
index 769ed93cb..b57286ecd 100644
--- a/lib/WebGUI/Help/Macro_Env.pm
+++ b/lib/WebGUI/Help/Macro_Env.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_Execute.pm b/lib/WebGUI/Help/Macro_Execute.pm
index 1d0b39719..039651a18 100644
--- a/lib/WebGUI/Help/Macro_Execute.pm
+++ b/lib/WebGUI/Help/Macro_Execute.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_Extras.pm b/lib/WebGUI/Help/Macro_Extras.pm
index cbefa1bd6..a5d71bc77 100644
--- a/lib/WebGUI/Help/Macro_Extras.pm
+++ b/lib/WebGUI/Help/Macro_Extras.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_FetchMimeType.pm b/lib/WebGUI/Help/Macro_FetchMimeType.pm
index 2de0d0aeb..982358774 100644
--- a/lib/WebGUI/Help/Macro_FetchMimeType.pm
+++ b/lib/WebGUI/Help/Macro_FetchMimeType.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_FileUrl.pm b/lib/WebGUI/Help/Macro_FileUrl.pm
index 4543ab7a5..c322a4057 100644
--- a/lib/WebGUI/Help/Macro_FileUrl.pm
+++ b/lib/WebGUI/Help/Macro_FileUrl.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_FormParam.pm b/lib/WebGUI/Help/Macro_FormParam.pm
index c00aabf51..487bfbc69 100644
--- a/lib/WebGUI/Help/Macro_FormParam.pm
+++ b/lib/WebGUI/Help/Macro_FormParam.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_GroupAdd.pm b/lib/WebGUI/Help/Macro_GroupAdd.pm
index 408cc8444..926bf2d81 100644
--- a/lib/WebGUI/Help/Macro_GroupAdd.pm
+++ b/lib/WebGUI/Help/Macro_GroupAdd.pm
@@ -16,10 +16,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_GroupDelete.pm b/lib/WebGUI/Help/Macro_GroupDelete.pm
index c7c185a69..07c313b30 100644
--- a/lib/WebGUI/Help/Macro_GroupDelete.pm
+++ b/lib/WebGUI/Help/Macro_GroupDelete.pm
@@ -16,10 +16,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_GroupText.pm b/lib/WebGUI/Help/Macro_GroupText.pm
index 470b48ce6..5a09d4cbd 100644
--- a/lib/WebGUI/Help/Macro_GroupText.pm
+++ b/lib/WebGUI/Help/Macro_GroupText.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_H_homeLink.pm b/lib/WebGUI/Help/Macro_H_homeLink.pm
index 35cc08bb2..136f07e44 100644
--- a/lib/WebGUI/Help/Macro_H_homeLink.pm
+++ b/lib/WebGUI/Help/Macro_H_homeLink.pm
@@ -16,10 +16,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_Hash_userId.pm b/lib/WebGUI/Help/Macro_Hash_userId.pm
index 8937510ad..e1a868ca5 100644
--- a/lib/WebGUI/Help/Macro_Hash_userId.pm
+++ b/lib/WebGUI/Help/Macro_Hash_userId.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_Include.pm b/lib/WebGUI/Help/Macro_Include.pm
index 4f21c4b17..2cbf8d9e6 100644
--- a/lib/WebGUI/Help/Macro_Include.pm
+++ b/lib/WebGUI/Help/Macro_Include.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_International.pm b/lib/WebGUI/Help/Macro_International.pm
index 046753279..028a45cdc 100644
--- a/lib/WebGUI/Help/Macro_International.pm
+++ b/lib/WebGUI/Help/Macro_International.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_L_loginBox.pm b/lib/WebGUI/Help/Macro_L_loginBox.pm
index d71d30042..aebba9dd3 100644
--- a/lib/WebGUI/Help/Macro_L_loginBox.pm
+++ b/lib/WebGUI/Help/Macro_L_loginBox.pm
@@ -66,10 +66,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_LastModified.pm b/lib/WebGUI/Help/Macro_LastModified.pm
index ddf66fe5e..9581660ff 100644
--- a/lib/WebGUI/Help/Macro_LastModified.pm
+++ b/lib/WebGUI/Help/Macro_LastModified.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 			{
 				tag => 'date',
 				namespace => 'Macro_D_date'
diff --git a/lib/WebGUI/Help/Macro_LoginToggle.pm b/lib/WebGUI/Help/Macro_LoginToggle.pm
index 253c8ebc3..d370e9021 100644
--- a/lib/WebGUI/Help/Macro_LoginToggle.pm
+++ b/lib/WebGUI/Help/Macro_LoginToggle.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_NewMail.pm b/lib/WebGUI/Help/Macro_NewMail.pm
index 3d6435570..4bc18443d 100644
--- a/lib/WebGUI/Help/Macro_NewMail.pm
+++ b/lib/WebGUI/Help/Macro_NewMail.pm
@@ -8,10 +8,6 @@ our $HELP = {
         fields => [
         ],
         related => [
-            {
-                tag => 'macros using',
-                namespace => 'Macros'
-            },
         ]
     },
 
diff --git a/lib/WebGUI/Help/Macro_Page.pm b/lib/WebGUI/Help/Macro_Page.pm
index ff56b1b96..552b73f79 100644
--- a/lib/WebGUI/Help/Macro_Page.pm
+++ b/lib/WebGUI/Help/Macro_Page.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_PageTitle.pm b/lib/WebGUI/Help/Macro_PageTitle.pm
index af2003799..7b3be67b2 100644
--- a/lib/WebGUI/Help/Macro_PageTitle.pm
+++ b/lib/WebGUI/Help/Macro_PageTitle.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_PageUrl.pm b/lib/WebGUI/Help/Macro_PageUrl.pm
index a7d231401..fb954cf59 100644
--- a/lib/WebGUI/Help/Macro_PageUrl.pm
+++ b/lib/WebGUI/Help/Macro_PageUrl.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_Product.pm b/lib/WebGUI/Help/Macro_Product.pm
index 9fa504451..0ceb4d343 100644
--- a/lib/WebGUI/Help/Macro_Product.pm
+++ b/lib/WebGUI/Help/Macro_Product.pm
@@ -65,10 +65,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 			{
 				tag => 'manage product',
 				namespace => 'ProductManager'
diff --git a/lib/WebGUI/Help/Macro_Quote.pm b/lib/WebGUI/Help/Macro_Quote.pm
index ae732d3af..4cadfe2b9 100644
--- a/lib/WebGUI/Help/Macro_Quote.pm
+++ b/lib/WebGUI/Help/Macro_Quote.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_RandomAssetProxy.pm b/lib/WebGUI/Help/Macro_RandomAssetProxy.pm
index 17cd8ed3c..67149c20d 100644
--- a/lib/WebGUI/Help/Macro_RandomAssetProxy.pm
+++ b/lib/WebGUI/Help/Macro_RandomAssetProxy.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_RandomThread.pm b/lib/WebGUI/Help/Macro_RandomThread.pm
index 47eb4593d..137024dc1 100644
--- a/lib/WebGUI/Help/Macro_RandomThread.pm
+++ b/lib/WebGUI/Help/Macro_RandomThread.pm
@@ -7,10 +7,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 			{
 				tag => 'random asset proxy',
 				namespace => 'Macro_RandomAssetProxy'
diff --git a/lib/WebGUI/Help/Macro_RootTitle.pm b/lib/WebGUI/Help/Macro_RootTitle.pm
index 99ee55f4b..5ddf7280b 100644
--- a/lib/WebGUI/Help/Macro_RootTitle.pm
+++ b/lib/WebGUI/Help/Macro_RootTitle.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_SQL.pm b/lib/WebGUI/Help/Macro_SQL.pm
index f5fc79a3a..86874ade4 100644
--- a/lib/WebGUI/Help/Macro_SQL.pm
+++ b/lib/WebGUI/Help/Macro_SQL.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_Slash_gatewayUrl.pm b/lib/WebGUI/Help/Macro_Slash_gatewayUrl.pm
index 816cce334..20a9eeb19 100644
--- a/lib/WebGUI/Help/Macro_Slash_gatewayUrl.pm
+++ b/lib/WebGUI/Help/Macro_Slash_gatewayUrl.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_Spacer.pm b/lib/WebGUI/Help/Macro_Spacer.pm
index f9feedcaa..c934c8a42 100644
--- a/lib/WebGUI/Help/Macro_Spacer.pm
+++ b/lib/WebGUI/Help/Macro_Spacer.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_Splat_random.pm b/lib/WebGUI/Help/Macro_Splat_random.pm
index b870f190d..c4b60d8eb 100644
--- a/lib/WebGUI/Help/Macro_Splat_random.pm
+++ b/lib/WebGUI/Help/Macro_Splat_random.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_SubscriptionItem.pm b/lib/WebGUI/Help/Macro_SubscriptionItem.pm
index fd97e54cb..568203d0c 100644
--- a/lib/WebGUI/Help/Macro_SubscriptionItem.pm
+++ b/lib/WebGUI/Help/Macro_SubscriptionItem.pm
@@ -22,10 +22,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_SubscriptionItemPurchaseUrl.pm b/lib/WebGUI/Help/Macro_SubscriptionItemPurchaseUrl.pm
index decf78fd9..6b42f06e2 100644
--- a/lib/WebGUI/Help/Macro_SubscriptionItemPurchaseUrl.pm
+++ b/lib/WebGUI/Help/Macro_SubscriptionItemPurchaseUrl.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_Thumbnail.pm b/lib/WebGUI/Help/Macro_Thumbnail.pm
index 46bf4175f..6508414cb 100644
--- a/lib/WebGUI/Help/Macro_Thumbnail.pm
+++ b/lib/WebGUI/Help/Macro_Thumbnail.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros',
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_URLEncode.pm b/lib/WebGUI/Help/Macro_URLEncode.pm
index b2ef68d93..b8ab8d4bf 100644
--- a/lib/WebGUI/Help/Macro_URLEncode.pm
+++ b/lib/WebGUI/Help/Macro_URLEncode.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_User.pm b/lib/WebGUI/Help/Macro_User.pm
index ba4f2ea50..68fce5176 100644
--- a/lib/WebGUI/Help/Macro_User.pm
+++ b/lib/WebGUI/Help/Macro_User.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros',
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_a_account.pm b/lib/WebGUI/Help/Macro_a_account.pm
index 99a387e84..625050786 100644
--- a/lib/WebGUI/Help/Macro_a_account.pm
+++ b/lib/WebGUI/Help/Macro_a_account.pm
@@ -16,10 +16,6 @@ our $HELP = {
 		          }
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros',
-			},
 			{
 				tag => 'template language',
 				namespace => 'Asset_Template',
diff --git a/lib/WebGUI/Help/Macro_c_companyName.pm b/lib/WebGUI/Help/Macro_c_companyName.pm
index 6d5092c3e..de39390e5 100644
--- a/lib/WebGUI/Help/Macro_c_companyName.pm
+++ b/lib/WebGUI/Help/Macro_c_companyName.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_e_companyEmail.pm b/lib/WebGUI/Help/Macro_e_companyEmail.pm
index 8b23bea64..91ace3b25 100644
--- a/lib/WebGUI/Help/Macro_e_companyEmail.pm
+++ b/lib/WebGUI/Help/Macro_e_companyEmail.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_r_printable.pm b/lib/WebGUI/Help/Macro_r_printable.pm
index 4a40e61ea..9c5fbf128 100644
--- a/lib/WebGUI/Help/Macro_r_printable.pm
+++ b/lib/WebGUI/Help/Macro_r_printable.pm
@@ -16,10 +16,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macro_u_companyUrl.pm b/lib/WebGUI/Help/Macro_u_companyUrl.pm
index 6ccaa3d78..477301972 100644
--- a/lib/WebGUI/Help/Macro_u_companyUrl.pm
+++ b/lib/WebGUI/Help/Macro_u_companyUrl.pm
@@ -8,10 +8,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'macros using',
-				namespace => 'Macros'
-			},
 		]
 	},
 
diff --git a/lib/WebGUI/Help/Macros.pm b/lib/WebGUI/Help/Macros.pm
index 93d344968..4363fd891 100644
--- a/lib/WebGUI/Help/Macros.pm
+++ b/lib/WebGUI/Help/Macros.pm
@@ -3,19 +3,6 @@ package WebGUI::Help::Macros;
 
 our $HELP = {
 
-    'macros using' => {
-		title => 'macros using title',
-		body => 'macros using body',
-		fields => [
-		],
-		related => [
-            {
-                tag => "macros list",
-                namespace => "Macros",
-            },
-        ],
-    },
-
     'macros list' => {
 		title => 'macros list title',
 		body => sub {
diff --git a/lib/WebGUI/i18n/English/Macro_AOIHits.pm b/lib/WebGUI/i18n/English/Macro_AOIHits.pm
deleted file mode 100644
index 096746f49..000000000
--- a/lib/WebGUI/i18n/English/Macro_AOIHits.pm
+++ /dev/null
@@ -1,47 +0,0 @@
-package WebGUI::i18n::English::Macro_AOIHits;
-
-our $I18N = {
-
-    'macroName' => {
-        message => q|AOI Hits|,
-        lastUpdated => 1128837648,
-    },
-
-    'aoi hits title' => {
-        message => q|Areas of Interest Hits Macro|,
-        lastUpdated => 1165355347,
-    },
-
-	'aoi hits body' => {
-		message => q|
-<p><b>&#94;AOIHits();</b><br />
-<b>&#94;AOIHits(<i>metadata property</i>, <i>metadata value</i>);</b><br />
-This macro displays to a user how many times they have visited Assets
-of a given type, based on Metadata and Passive Profiling.  To use the
-macro, you will need to enable Passive Profiling in the WebGUI Settings
-admin screen, and then add Metadata to the Assets in your site.</p>
-
-<p>Here's an example:</p>
-
-<p>Suppose you run a news site, and you want to tell the user how many times they have
-visited several kinds of stories.
-You enable Passive Profiling in the WebGUI Settings, then create a new Metadata
-field called "contentType".  As your content managers add stories to the site, they also classify
-the stories by giving the Metadata field contentType a value, such as "Sports", "General Interest",
-"Regional", "Business", "Entertainment" and so on.  On each page, you add
-you place these &#94;AOIHits() macro calls to show the user how many times they have
-visited Sports, Regional and Business stories:</p>
-
-<p>You visited sports stories: &#94;AOIHits(contentType,Sports); times<br />
-You visited sports stories: &#94;AOIHits(contentType,Regional); times<br />
-You visited sports stories: &#94;AOIHits(contentType,Business); times</p>
-
-<p>You must give &#94;AOIRank(); two arguments, the Metadata property to use and the
-Metadata value whose count you want displayed to the user.</p>
-<p>This Macro may be nested inside other Macros.</p>
-|,
-		lastUpdated => 1168558407,
-	},
-};
-
-1;
diff --git a/lib/WebGUI/i18n/English/Macro_AOIRank.pm b/lib/WebGUI/i18n/English/Macro_AOIRank.pm
deleted file mode 100644
index 455207716..000000000
--- a/lib/WebGUI/i18n/English/Macro_AOIRank.pm
+++ /dev/null
@@ -1,49 +0,0 @@
-package WebGUI::i18n::English::Macro_AOIRank;
-
-our $I18N = {
-
-    'macroName' => {
-        message => q|AOI Rank|,
-        lastUpdated => 1128837912,
-    },
-
-    'aoi rank title' => {
-        message => q|Areas of Interest Rank Macro|,
-        lastUpdated => 1165355407,
-    },
-
-	'aoi rank body' => {
-		message => q|
-<p>
-<b>&#94;AOIRank(<i>metadata property</i>, [<i>rank</i>]);</b><br />
-This macro is for displaying which Assets are the most frequently viewed on your site, based on 
-Metadata and Passive Profiling.  To use the macro, you will need to enable Passive Profiling in the 
-WebGUI Settings admin screen, and then add Metadata to the Assets in your site.</p>
-
-<p>Here's an example:</p>
-
-<p>Suppose you run a news site, and you want to know what kinds of news stories are the
-most popular.  You enable Passive Profiling in the WebGUI Settings, then create a new Metadata
-field called "contentType".  As your content managers add stories to the site, they also classify
-the stories by giving the Metadata field contentType a value, such as "Sports", "General Interest",
-"Regional", "Business", "Entertainment" and so on.  Next, on a separate page of your site,
-you place these &#94;AOIRank() macro calls:</p>
-
-<p>Most popular kind of story: &#94;AOIRank(contentType);<br />
-Second-most popular kind of story: &#94;AOIRank(contentType,2);<br />
-Third most popular kind of story: &#94;AOIRank(contentType,3);</p>
-
-<p>By default, &#94;AOIRank(contentType); will always display the most popular Metadata property,
-which in our case is called contentType.  If you wish to see which Metadata properties are lower
-ranked, pass the macro the rank that you want to see.</p>
-
-<p>As users visit your site, each story they read will be counted up and added to the counter for
-the correct contentType.  As you visit you separate page, you'll see the three most popular types
-of stories.</p>
-<p>This Macro may be nested inside other Macros if the Metadata field does not contain commas or quotes.</p>
-|,
-		lastUpdated => 1168558455,
-	},
-};
-
-1;
diff --git a/lib/WebGUI/i18n/English/Macro_AdSpace.pm b/lib/WebGUI/i18n/English/Macro_AdSpace.pm
deleted file mode 100644
index 792682b02..000000000
--- a/lib/WebGUI/i18n/English/Macro_AdSpace.pm
+++ /dev/null
@@ -1,30 +0,0 @@
-package WebGUI::i18n::English::Macro_AdSpace;
-
-our $I18N = {
-	'adspace title' => {
-		message => q|Ad Space Macro|,
-		lastUpdated => 1144979657,
-	},
-
-	'adspace body' => {
-		message => q|
-<p><b>&#94;AdSpace;</b><br />
-<b>&#94;AdSpace(adName);</b><br />
-This macro is used to display advertisements from the AdSpace system on a page.  The macro
-takes a single argument, which is the name of the Ad Space from the AdSpace manager to display
-from the AdSpace manager.
-As a convenience, the AdSpace manager will display the macro code to put into a page to
-display each Ad Space.</p>
-<p>This Macro may not be nested inside other Macros.</p>
-|,
-		lastUpdated => 1168558375,
-	},
-
-	'macroName' => {
-		message => q|Ad Space|,
-		lastUpdated => 1144979669,
-	},
-
-};
-
-1;
diff --git a/lib/WebGUI/i18n/English/Macro_AdminBar.pm b/lib/WebGUI/i18n/English/Macro_AdminBar.pm
index 8193db3ed..697b07bee 100644
--- a/lib/WebGUI/i18n/English/Macro_AdminBar.pm
+++ b/lib/WebGUI/i18n/English/Macro_AdminBar.pm
@@ -3,7 +3,7 @@ package WebGUI::i18n::English::Macro_AdminBar;
 our $I18N = {
 
 	'admin bar title' => {
-		message => q|Admin Bar Macro|,
+		message => q|Admin Bar Macro Template Variables|,
 		lastUpdated => 1112374923,
 	},
 
@@ -42,21 +42,6 @@ our $I18N = {
 		lastUpdated => 1149178356,
 	},
 
-
-	'admin bar body' => {
-		message => q|
-
-<p><b>&#94;AdminBar;</b><br />
-<b>&#94;AdminBar(<i>custom template ID</i>);</b><br />
-Places the administrative tool bar on the page. Omitting this macro will prevent you from adding content, pasting
-content from the clipboard, accessing the help system and other administrative functions.</p>
-<p>This Macro may not be nested inside other Macros.</p>
-<p>
-The macro may take one optional argument, an alternate template in the Macro/AdminBar namespace for generating the AdminBar.  The following variables are available in the template:</p>
-|,
-		lastUpdated => 1168558295,
-	},
-
 	'376' => {
 		message => q|Package|,
 		lastUpdated => 1031514049
diff --git a/lib/WebGUI/i18n/English/Macro_AdminText.pm b/lib/WebGUI/i18n/English/Macro_AdminText.pm
deleted file mode 100644
index b8ac2d824..000000000
--- a/lib/WebGUI/i18n/English/Macro_AdminText.pm
+++ /dev/null
@@ -1,26 +0,0 @@
-package WebGUI::i18n::English::Macro_AdminText;
-
-our $I18N = {
-
-    'macroName' => {
-        message => q|Admin Text|,
-        lastUpdated => 1128837612,
-    },
-
-    'admin text title' => {
-        message => q|Admin Text Macro|,
-        lastUpdated => 1112466408,
-    },
-
-	'admin text body' => {
-		message => q|
-<p><b>&#94;AdminText(<i>text message</i>);</b><br />
-Displays a small text message to a user who is in admin mode. Example: &#94;AdminText("You are in admin mode!");
-</p>
-<p>This Macro may be nested inside other Macros if the text does not contain commas or quotes.</p>
-|,
-		lastUpdated => 1168558334,
-	},
-};
-
-1;
diff --git a/lib/WebGUI/i18n/English/Macro_AdminToggle.pm b/lib/WebGUI/i18n/English/Macro_AdminToggle.pm
index af6c682f3..2ee8e245e 100644
--- a/lib/WebGUI/i18n/English/Macro_AdminToggle.pm
+++ b/lib/WebGUI/i18n/English/Macro_AdminToggle.pm
@@ -8,7 +8,7 @@ our $I18N = {
     },
 
     'admin toggle title' => {
-        message => q|Admin Toggle Macro|,
+        message => q|Admin Toggle Macro Template Variables|,
         lastUpdated => 1112466408,
     },
 
@@ -22,22 +22,6 @@ our $I18N = {
 		lastUpdated => 1149178440,
 	},
 
-	'admin toggle body' => {
-		message => q|
-
-<p><b>&#94;AdminToggle();</b><br />
-<b>&#94;AdminToggle([<i>enable admin</i>], [<i>disable admin</i>], [<i>template name</i>]);</b><br />
-Places a link on the page which is only visible to content managers and administrators. The link toggles on/off admin mode. You can optionally specify other messages to display like this: &#94;AdminToggle("Edit On","Edit Off"); This macro optionally takes a third parameter that allows you to specify an alternate template name in the Macro/AdminToggle namespace.
-</p>
-<p>This Macro may be nested inside other Macros if the text does not contain commas or quotes.</p>
-<p>
-The following variables are available in the template:
-</p>
-
-|,
-		lastUpdated => 1168558355,
-	},
-
 	'516' => {
 		message => q|Turn Admin On!|,
 		lastUpdated => 1031514049
diff --git a/lib/WebGUI/i18n/English/Macro_AssetProxy.pm b/lib/WebGUI/i18n/English/Macro_AssetProxy.pm
index 950b405ed..da2008194 100644
--- a/lib/WebGUI/i18n/English/Macro_AssetProxy.pm
+++ b/lib/WebGUI/i18n/English/Macro_AssetProxy.pm
@@ -2,37 +2,11 @@ package WebGUI::i18n::English::Macro_AssetProxy;
 
 our $I18N = {
 
-    'macroName' => {
-        message => q|Asset Proxy|,
-        lastUpdated => 1128837929,
-    },
-
-    'asset proxy title' => {
-        message => q|Asset Proxy Macro|,
-        lastUpdated => 1112315917,
-    },
-
     'invalid url' => {
         message => q|Invalid Asset URL|,
         lastUpdated => 1134769012,
     },
 
-    'asset proxy body' => {
-        message => q|
-<p><b>&#94;AssetProxy</b>(<i>Asset URL</i>);<br />
-This macro is used to render an Asset and display it inline according
-to its template.  Any Asset can be displayed, including Navigations,
-images, links to files for downloading or for snippets.</p>
-
-<p>It can also be like a Shortcut Asset, displaying content from another
-part of the site on this page.  Unlike a Shortcut, it cannot override
-any part of the original Asset.</p>
-<p>This Macro may not be nested inside other Macros.</p>
-
-        |,
-        lastUpdated => 1168558479,
-    },
-
 };
 
 1;
diff --git a/lib/WebGUI/i18n/English/Macro_At_username.pm b/lib/WebGUI/i18n/English/Macro_At_username.pm
deleted file mode 100644
index 564016993..000000000
--- a/lib/WebGUI/i18n/English/Macro_At_username.pm
+++ /dev/null
@@ -1,26 +0,0 @@
-package WebGUI::i18n::English::Macro_At_username;
-
-our $I18N = {
-
-    'macroName' => {
-        message => q|User Name|,
-        lastUpdated => 1128837946,
-    },
-
-    'username title' => {
-        message => q|User Name Macro|,
-        lastUpdated => 1112466408,
-    },
-
-	'username body' => {
-		message => q|
-<p><b>&#94;@; - Username</b><br />
-The username of the currently logged in user.
-</p>
-<p>This Macro may be nested inside other Macros if all usernames do not contain commas or quotes.</p>
-|,
-		lastUpdated => 1168558540,
-	},
-};
-
-1;
diff --git a/lib/WebGUI/i18n/English/Macro_CanEditText.pm b/lib/WebGUI/i18n/English/Macro_CanEditText.pm
deleted file mode 100644
index 5f0a9042e..000000000
--- a/lib/WebGUI/i18n/English/Macro_CanEditText.pm
+++ /dev/null
@@ -1,35 +0,0 @@
-package WebGUI::i18n::English::Macro_CanEditText;
-
-our $I18N = {
-
-    'macroName' => {
-        message => q|Can Edit Text|,
-        lastUpdated => 1128837964,
-    },
-
-    'can edit text title' => {
-        message => q|Can Edit Text Macro|,
-        lastUpdated => 1112466408,
-    },
-
-	'can edit text body' => {
-		message => q|
-<p><b>&#94;CanEditText(<i>text message</i>);</b><br />
-Display a message to a user that can edit the current Asset.
-</p>
-
-<p><i>Example:</i><br />
-&#94;CanEditText("You may edit this Asset");<br />
-&#94;CanEditText(&#94;AdminToggle;);
-</p>
-
-<p>Do not use this Macro outside of an Asset as it will have unpredictable
-results.
-</p>
-<p>This Macro may be nested inside other Macros if the text does not contain commas or quotes.</p>
-|,
-		lastUpdated => 1168558566,
-	},
-};
-
-1;