diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index 43305869b1738846e334b463654af440a3b6bdad..51515c70e9f2d22744a0b795d739001722e0ff5b 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -21,10 +21,7 @@
  * \brief ODBC CDR Backend
  *
  * \author Brian K. West <brian@bkw.org>
- *
- * See also:
- * \arg http://www.unixodbc.org
- * \arg \ref Config_cdr
+ * http://www.unixodbc.org
  * \ingroup cdr_drivers
  */
 
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 56d2c6d135a85745a1c1d951c40df32994e9ddaa..b189e0952e3e7b60649f3ff2542a9303ce295193 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -26,10 +26,6 @@
  *
  * \author Matthew D. Hardeman <mhardemn@papersoft.com>
  * PostgreSQL http://www.postgresql.org/
- *
- * See also
- * \arg \ref Config_cdr
- * PostgreSQL http://www.postgresql.org/
  * \ingroup cdr_drivers
  */
 
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index 2de4e426ae7199b5f74c23caa0b65c7be4507985..4a661532054f9805a833c7d8511995fe89ae77d2 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -17,10 +17,7 @@
 /*!
  * \file
  * \brief FreeTDS CDR logger
- *
- * See also
- * \arg \ref Config_cdr
- * \arg http://www.freetds.org/
+ * http://www.freetds.org/
  * \ingroup cdr_drivers
  */
 
diff --git a/cel/cel_beanstalkd.c b/cel/cel_beanstalkd.c
index fe4f430e97214e88354a7a003257b2d00831cc58..57bb8e7d17632b739db29d96ffabf2b10b2abb4f 100644
--- a/cel/cel_beanstalkd.c
+++ b/cel/cel_beanstalkd.c
@@ -24,9 +24,6 @@
  *
  * This module requires the beanstalk-client library, avaialble from
  * https://github.com/deepfryed/beanstalk-client
- *
- * See also
- * \arg \ref AstCEL
  * \ingroup cel_drivers
  */
 
diff --git a/cel/cel_custom.c b/cel/cel_custom.c
index 73423a362bbf3822ab6612b33212dd12ad95df52..1ca89f1ad204364d4e333a805d47ea237fdc8725 100644
--- a/cel/cel_custom.c
+++ b/cel/cel_custom.c
@@ -22,9 +22,6 @@
  * \brief Custom Comma Separated Value CEL records.
  *
  * \author Steve Murphy <murf@digium.com>
- *
- * \arg See also \ref AstCEL
- *
  * Logs in LOG_DIR/cel_custom
  * \ingroup cel_drivers
  */
diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c
index 4accd56ac4af2a94e27ed1153285f8ff629dfd6e..208bdd1f242efcf36a6710bfe6d765928763cdb0 100644
--- a/cel/cel_pgsql.c
+++ b/cel/cel_pgsql.c
@@ -30,10 +30,6 @@
  *
  * \author Steve Murphy <murf@digium.com>
  * PostgreSQL http://www.postgresql.org/
- *
- * See also
- * \arg \ref Config_cel
- * PostgreSQL http://www.postgresql.org/
  * \ingroup cel_drivers
  */
 
diff --git a/cel/cel_radius.c b/cel/cel_radius.c
index 4e87f86d5d3000ccd259fd97aecb6d4d4f728d43..4d7a6cd9c34a47fd6414999d44f813d830cda4f8 100644
--- a/cel/cel_radius.c
+++ b/cel/cel_radius.c
@@ -21,8 +21,6 @@
  * \brief RADIUS CEL Support
  * \author Philippe Sultan
  * The Radius Client Library - http://developer.berlios.de/projects/radiusclient-ng/
- *
- * \arg See also \ref AstCEL
  * \ingroup cel_drivers
  */
 
diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c
index db38eaf3eb01cd6b9b647dea3f4f040d8069f842..23a5b43b03720aaacef90496ae6cdefd1036a5f0 100644
--- a/cel/cel_sqlite3_custom.c
+++ b/cel/cel_sqlite3_custom.c
@@ -26,11 +26,6 @@
  *  Russell Bryant <russell@digium.com> from
  *  cdr_mysql_custom by Edward Eastman <ed@dm3.co.uk>,
  *	and cdr_sqlite by Holger Schurig <hs4233@mail.mn-solutions.de>
- *
- *
- * \arg See also \ref AstCEL
- *
- *
  * \ingroup cel_drivers
  */
 
diff --git a/cel/cel_tds.c b/cel/cel_tds.c
index 0aa73e52238f9b808330cb474bc0b7912feaa673..4b22ff1a48fd8f309650ba033f042d5b6a437fff 100644
--- a/cel/cel_tds.c
+++ b/cel/cel_tds.c
@@ -17,10 +17,7 @@
 /*! \file
  *
  * \brief FreeTDS CEL logger
- *
- * See also
- * \arg \ref Config_cel
- * \arg http://www.freetds.org/
+ * http://www.freetds.org/
  * \ingroup cel_drivers
  */
 
diff --git a/include/asterisk/doxyref.h b/include/asterisk/doxyref.h
index 04e46ef7cea216d006ac9bf9bbcf85ff592c52c0..d6daa85c80e1de12d0f6b0f25dcdf66592fd605b 100644
--- a/include/asterisk/doxyref.h
+++ b/include/asterisk/doxyref.h
@@ -43,18 +43,13 @@
  * \arg \ref AstAMI : The Call management socket API
  * \arg \ref AstARA : A generic data storage and retrieval API for Asterisk
  * \arg \ref AstDUNDi : A way to find phone services dynamically by using the DUNDi protocol
- * \arg \ref AJI_intro : The Asterisk Jabber Interface
  * \arg \ref AstCDR
  * \arg \ref AstVar
  * \arg \ref AstVideo
- * \arg \ref AstENUM : The IETF way to redirect from phone numbers to VoIP calls
  * \arg \ref AstHTTP
- * \arg \ref AstSpeech
  *
  * \section debugconfig Debugging and Configuration References
- * \arg \ref AstDebug : Hints on debugging
  * \arg \ref extref
- * \arg \ref ConfigFiles
  * \arg \ref SoundFiles included in the Asterisk distribution
  *
  * \section weblinks Web sites
@@ -81,9 +76,7 @@
  * Some generic documents on the Asterisk architecture
  *
  * \arg \ref AstThreadStorage
- * \arg \ref DataStores
  * \arg \ref AstExtState
- * \arg \ref AstDataRetrieval
  *
  * \subsection channel_txt Channels
  * \arg See \ref Def_Channel
@@ -163,7 +156,6 @@
  * \par See also
  * \arg \ref cdr.c
  * \arg \ref cdr_drivers
- * \arg \ref Config_cdr CDR configuration files
  *
  * \todo include missing cdrdriver txt
  */
@@ -314,7 +306,6 @@
  * \brief CDR drivers are loaded dynamically, each loaded CDR driver produce
  *        a billing record for each call.
  * \arg \ref Config_mod "Modules Configuration"
- * \arg \ref Config_cdr "CDR Configuration"
  */
 
 /*!