diff --git a/aegisub/src/command/app.cpp b/aegisub/src/command/app.cpp
index f42d304c2..92edc6ff1 100644
--- a/aegisub/src/command/app.cpp
+++ b/aegisub/src/command/app.cpp
@@ -29,11 +29,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file app.cpp
-/// @brief app/ commands.
-/// @ingroup command
-///
-
 #include "../config.h"
 
 #include <wx/msgdlg.h>
@@ -61,10 +56,6 @@
 namespace {
 	using cmd::Command;
 
-/// @defgroup cmd-app Application related
-/// @{
-
-/// Launch about dialogue.
 struct app_about : public Command {
 	CMD_NAME("app/about")
 	STR_MENU("&About")
@@ -76,8 +67,6 @@ struct app_about : public Command {
 	}
 };
 
-
-/// Display audio and subtitles.
 struct app_display_audio_subs : public Command {
 	CMD_NAME("app/display/audio_subs")
 	STR_MENU("&Audio+Subs View")
@@ -98,8 +87,6 @@ struct app_display_audio_subs : public Command {
 	}
 };
 
-
-/// Display audio, video and subtitles.
 struct app_display_full : public Command {
 	CMD_NAME("app/display/full")
 	STR_MENU("&Full view")
@@ -120,8 +107,6 @@ struct app_display_full : public Command {
 	}
 };
 
-
-/// Display subtitles only.
 struct app_display_subs : public Command {
 	CMD_NAME("app/display/subs")
 	STR_MENU("S&ubs Only View")
@@ -138,8 +123,6 @@ struct app_display_subs : public Command {
 	}
 };
 
-
-/// Display video and subtitles only.
 struct app_display_video_subs : public Command {
 	CMD_NAME("app/display/video_subs")
 	STR_MENU("&Video+Subs View")
@@ -160,8 +143,6 @@ struct app_display_video_subs : public Command {
 	}
 };
 
-
-/// Exit the application.
 struct app_exit : public Command {
 	CMD_NAME("app/exit")
 	STR_MENU("E&xit")
@@ -173,8 +154,6 @@ struct app_exit : public Command {
 	}
 };
 
-
-/// Select Aegisub interface language
 struct app_language : public Command {
 	CMD_NAME("app/language")
 	STR_MENU("&Language...")
@@ -199,7 +178,6 @@ struct app_language : public Command {
 	}
 };
 
-/// Event log.
 struct app_log : public Command {
 	CMD_NAME("app/log")
 	STR_MENU("&Log window")
@@ -211,8 +189,6 @@ struct app_log : public Command {
 	}
 };
 
-
-/// Open a new application window.
 struct app_new_window : public Command {
 	CMD_NAME("app/new_window")
 	STR_MENU("New &Window")
@@ -224,8 +200,6 @@ struct app_new_window : public Command {
 	}
 };
 
-
-/// Configure Aegisub.
 struct app_options : public Command {
 	CMD_NAME("app/options")
 	STR_MENU("&Options...")
@@ -241,7 +215,6 @@ struct app_options : public Command {
 	}
 };
 
-/// Toggle global override hotkeys (aka medusa mode).
 struct app_toggle_global_hotkeys : public Command {
 	CMD_NAME("app/toggle/global_hotkeys")
 	STR_MENU("Toggle global hotkey overrides")
@@ -259,7 +232,6 @@ struct app_toggle_global_hotkeys : public Command {
 	}
 };
 
-/// Toggle the main toolbar
 struct app_toggle_toolbar : public Command {
 	CMD_NAME("app/toggle/toolbar")
 	STR_HELP("Toggle the main toolbar")
@@ -281,7 +253,6 @@ struct app_toggle_toolbar : public Command {
 	}
 };
 
-/// Check to see if there is a new version of Aegisub available.
 struct app_updates : public Command {
 	CMD_NAME("app/updates")
 	STR_MENU("&Check for Updates...")
@@ -293,7 +264,6 @@ struct app_updates : public Command {
 	}
 };
 
-/// @}
 }
 
 namespace cmd {
diff --git a/aegisub/src/command/audio.cpp b/aegisub/src/command/audio.cpp
index 162aef2df..3b6920e08 100644
--- a/aegisub/src/command/audio.cpp
+++ b/aegisub/src/command/audio.cpp
@@ -29,11 +29,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file audio.cpp
-/// @brief audio/ commands.
-/// @ingroup command
-///
-
 #include "../config.h"
 
 #include "command.h"
@@ -64,10 +59,6 @@ namespace {
 		}
 	};
 
-/// @defgroup cmd-audio Audio commands.
-/// @{
-
-/// Closes the currently open audio file.
 struct audio_close : public validate_audio_open {
 	CMD_NAME("audio/close")
 	STR_MENU("&Close Audio")
@@ -79,8 +70,6 @@ struct audio_close : public validate_audio_open {
 	}
 };
 
-
-/// Opens an audio file.
 struct audio_open : public Command {
 	CMD_NAME("audio/open")
 	STR_MENU("&Open Audio File...")
@@ -104,8 +93,6 @@ struct audio_open : public Command {
 	}
 };
 
-
-/// Open a 150 minutes blank audio clip, for debugging.
 struct audio_open_blank : public Command {
 	CMD_NAME("audio/open/blank")
 	STR_MENU("Open 2h30 Blank Audio")
@@ -122,8 +109,6 @@ struct audio_open_blank : public Command {
 	}
 };
 
-
-/// Open a 150 minutes noise-filled audio clip, for debugging.
 struct audio_open_noise : public Command {
 	CMD_NAME("audio/open/noise")
 	STR_MENU("Open 2h30 Noise Audio")
@@ -140,8 +125,6 @@ struct audio_open_noise : public Command {
 	}
 };
 
-
-/// Opens the audio from the current video file.
 struct audio_open_video : public Command {
 	CMD_NAME("audio/open/video")
 	STR_MENU("Open Audio from &Video")
@@ -164,8 +147,6 @@ struct audio_open_video : public Command {
 	}
 };
 
-
-/// Display audio as a frequency-power spectrograph.
 struct audio_view_spectrum : public Command {
 	CMD_NAME("audio/view/spectrum")
 	STR_MENU("&Spectrum Display")
@@ -182,8 +163,6 @@ struct audio_view_spectrum : public Command {
 	}
 };
 
-
-/// Display audio as a linear amplitude graph.
 struct audio_view_waveform : public Command {
 	CMD_NAME("audio/view/waveform")
 	STR_MENU("&Waveform Display")
@@ -200,7 +179,6 @@ struct audio_view_waveform : public Command {
 	}
 };
 
-/// Save the audio for the selected lines.
 struct audio_save_clip : public Command {
 	CMD_NAME("audio/save/clip")
 	STR_MENU("Create audio clip")
@@ -228,7 +206,6 @@ struct audio_save_clip : public Command {
 	}
 };
 
-/// Play the current audio selection
 struct audio_play_current_selection : public validate_audio_open {
 	CMD_NAME("audio/play/current")
 	STR_MENU("Play current audio selection")
@@ -241,7 +218,6 @@ struct audio_play_current_selection : public validate_audio_open {
 	}
 };
 
-/// Play the current line
 struct audio_play_current_line : public validate_audio_open {
 	CMD_NAME("audio/play/line")
 	STR_MENU("Play current line")
@@ -256,7 +232,6 @@ struct audio_play_current_line : public validate_audio_open {
 	}
 };
 
-/// Play the current audio selection
 struct audio_play_selection : public validate_audio_open {
 	CMD_NAME("audio/play/selection")
 	STR_MENU("Play audio selection")
@@ -269,7 +244,6 @@ struct audio_play_selection : public validate_audio_open {
 	}
 };
 
-/// Play the current audio selection or stop audio playback
 struct audio_play_toggle : public validate_audio_open {
 	CMD_NAME("audio/play/toggle")
 	STR_MENU("Play audio selection or stop")
@@ -286,7 +260,6 @@ struct audio_play_toggle : public validate_audio_open {
 	}
 };
 
-/// Stop playing audio
 struct audio_stop : public Command {
 	CMD_NAME("audio/stop")
 	STR_MENU("Stop playing")
@@ -304,7 +277,6 @@ struct audio_stop : public Command {
 	}
 };
 
-/// Play 500 ms before the selected audio range
 struct audio_play_before : public validate_audio_open {
 	CMD_NAME("audio/play/selection/before")
 	STR_MENU("Play 500 ms before selection")
@@ -318,7 +290,6 @@ struct audio_play_before : public validate_audio_open {
 	}
 };
 
-/// Play 500 ms after the selected audio range
 struct audio_play_after : public validate_audio_open {
 	CMD_NAME("audio/play/selection/after")
 	STR_MENU("Play 500 ms after selection")
@@ -332,7 +303,6 @@ struct audio_play_after : public validate_audio_open {
 	}
 };
 
-/// Play the last 500 ms of the audio range
 struct audio_play_end : public validate_audio_open {
 	CMD_NAME("audio/play/selection/end")
 	STR_MENU("Play last 500 ms of selection")
@@ -346,7 +316,6 @@ struct audio_play_end : public validate_audio_open {
 	}
 };
 
-/// Play the first 500 ms of the audio range
 struct audio_play_begin : public validate_audio_open {
 	CMD_NAME("audio/play/selection/begin")
 	STR_MENU("Play first 500 ms of selection")
@@ -362,7 +331,6 @@ struct audio_play_begin : public validate_audio_open {
 	}
 };
 
-/// Play from the beginning of the audio range to the end of the file
 struct audio_play_to_end : public validate_audio_open {
 	CMD_NAME("audio/play/to_end")
 	STR_MENU("Play from selection start to end of file")
@@ -375,8 +343,6 @@ struct audio_play_to_end : public validate_audio_open {
 	}
 };
 
-/// Commit any pending audio timing changes
-/// @todo maybe move to time?
 struct audio_commit : public validate_audio_open {
 	CMD_NAME("audio/commit")
 	STR_MENU("Commit")
@@ -393,8 +359,6 @@ struct audio_commit : public validate_audio_open {
 	}
 };
 
-/// Commit any pending audio timing changes
-/// @todo maybe move to time?
 struct audio_commit_default : public validate_audio_open {
 	CMD_NAME("audio/commit/default")
 	STR_MENU("Commit and use default timing for next line")
@@ -410,8 +374,6 @@ struct audio_commit_default : public validate_audio_open {
 	}
 };
 
-/// Commit any pending audio timing changes and move to the next line
-/// @todo maybe move to time?
 struct audio_commit_next : public validate_audio_open {
 	CMD_NAME("audio/commit/next")
 	STR_MENU("Commit and move to next line")
@@ -427,8 +389,6 @@ struct audio_commit_next : public validate_audio_open {
 	}
 };
 
-/// Commit any pending audio timing changes and stay on the current line
-/// @todo maybe move to time?
 struct audio_commit_stay : public validate_audio_open {
 	CMD_NAME("audio/commit/stay")
 	STR_MENU("Commit and stay on current line")
@@ -441,7 +401,6 @@ struct audio_commit_stay : public validate_audio_open {
 	}
 };
 
-/// Scroll the audio display to the current selection
 struct audio_go_to : public validate_audio_open {
 	CMD_NAME("audio/go_to")
 	STR_MENU("Go to selection")
@@ -453,7 +412,6 @@ struct audio_go_to : public validate_audio_open {
 	}
 };
 
-/// Scroll the audio display left
 struct audio_scroll_left : public validate_audio_open {
 	CMD_NAME("audio/scroll/left")
 		STR_MENU("Scroll left")
@@ -465,8 +423,6 @@ struct audio_scroll_left : public validate_audio_open {
 	}
 };
 
-
-/// Scroll the audio display right
 struct audio_scroll_right : public validate_audio_open {
 	CMD_NAME("audio/scroll/right")
 		STR_MENU("Scroll right")
@@ -482,7 +438,6 @@ static inline void toggle(const char *opt) {
 	OPT_SET(opt)->SetBool(!OPT_GET(opt)->GetBool());
 }
 
-/// Toggle autoscrolling the audio display to the selected line when switch lines
 struct audio_autoscroll : public Command {
 	CMD_NAME("audio/opt/autoscroll")
 	STR_MENU("Auto scroll audio display to selected line")
@@ -499,7 +454,6 @@ struct audio_autoscroll : public Command {
 	}
 };
 
-/// Toggle automatically committing changes made in the audio display
 struct audio_autocommit : public Command {
 	CMD_NAME("audio/opt/autocommit")
 	STR_MENU("Automatically commit all changes")
@@ -516,7 +470,6 @@ struct audio_autocommit : public Command {
 	}
 };
 
-/// Toggle automatically advancing to the next line after a commit
 struct audio_autonext : public Command {
 	CMD_NAME("audio/opt/autonext")
 	STR_MENU("Auto go to next line on commit")
@@ -533,7 +486,6 @@ struct audio_autonext : public Command {
 	}
 };
 
-/// Toggle spectrum analyzer mode
 struct audio_toggle_spectrum : public Command {
 	CMD_NAME("audio/opt/spectrum")
 	STR_MENU("Spectrum analyzer mode")
@@ -550,7 +502,6 @@ struct audio_toggle_spectrum : public Command {
 	}
 };
 
-/// Toggle linked vertical zoom and volume
 struct audio_vertical_link : public Command {
 	CMD_NAME("audio/opt/vertical_link")
 	STR_MENU("Link vertical zoom and volume sliders")
@@ -567,7 +518,6 @@ struct audio_vertical_link : public Command {
 	}
 };
 
-/// Toggle karaoke mode
 struct audio_karaoke : public Command {
 	CMD_NAME("audio/karaoke")
 	STR_MENU("Toggle karaoke mode")
@@ -583,8 +533,6 @@ struct audio_karaoke : public Command {
 	}
 };
 
-/// @}
-
 }
 
 namespace cmd {
diff --git a/aegisub/src/command/automation.cpp b/aegisub/src/command/automation.cpp
index 5527439a6..9d9cbf8b0 100644
--- a/aegisub/src/command/automation.cpp
+++ b/aegisub/src/command/automation.cpp
@@ -29,14 +29,8 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file automation.cpp
-/// @brief am/ (automation) commands
-/// @ingroup command
-///
-
 #include "../config.h"
 
-
 #include "command.h"
 
 #include "../auto4_base.h"
@@ -53,8 +47,6 @@
 
 namespace {
 	using cmd::Command;
-/// @defgroup cmd-am Automation commands
-/// @{
 
 struct reload_all : public Command {
 	CMD_NAME("am/reload")
@@ -110,7 +102,6 @@ struct meta : public Command {
 	}
 };
 
-/// @}
 }
 
 namespace cmd {
diff --git a/aegisub/src/command/command.cpp b/aegisub/src/command/command.cpp
index ea575f5d9..71446c2d4 100644
--- a/aegisub/src/command/command.cpp
+++ b/aegisub/src/command/command.cpp
@@ -12,10 +12,6 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-/// @file command.cpp
-/// @brief Command system base file.
-/// @ingroup command
-
 #include "command.h"
 
 #include "icon.h"
diff --git a/aegisub/src/command/edit.cpp b/aegisub/src/command/edit.cpp
index 88a7e898c..0a3c274bd 100644
--- a/aegisub/src/command/edit.cpp
+++ b/aegisub/src/command/edit.cpp
@@ -29,11 +29,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file edit.cpp
-/// @brief edit/ commands.
-/// @ingroup command
-///
-
 #include "../config.h"
 
 #include "command.h"
@@ -76,8 +71,6 @@
 namespace {
 	using namespace boost::adaptors;
 	using cmd::Command;
-/// @defgroup cmd-edit Editing commands.
-/// @{
 
 struct validate_sel_nonempty : public Command {
 	CMD_TYPE(COMMAND_VALIDATE)
@@ -165,7 +158,6 @@ T get_value(boost::ptr_vector<AssDialogueBlock> const& blocks, int blockn, T ini
 	return initial;
 }
 
-/// Get the block index in the text of the position
 int block_at_pos(std::string const& text, int pos) {
 	int n = 0;
 	int max = text.size() - 1;
@@ -446,7 +438,6 @@ struct edit_font : public Command {
 	}
 };
 
-/// Find and replace words in subtitles.
 struct edit_find_replace : public Command {
 	CMD_NAME("edit/find_replace")
 	STR_MENU("Find and R&eplace...")
@@ -510,7 +501,6 @@ static void delete_lines(agi::Context *c, wxString const& commit_message) {
 	c->selectionController->SetSelectionAndActive(sel, new_active);
 }
 
-/// Copy subtitles.
 struct edit_line_copy : public validate_sel_nonempty {
 	CMD_NAME("edit/line/copy")
 	STR_MENU("&Copy Lines")
@@ -533,7 +523,6 @@ struct edit_line_copy : public validate_sel_nonempty {
 	}
 };
 
-/// Cut subtitles.
 struct edit_line_cut: public validate_sel_nonempty {
 	CMD_NAME("edit/line/cut")
 	STR_MENU("Cu&t Lines")
@@ -550,7 +539,6 @@ struct edit_line_cut: public validate_sel_nonempty {
 	}
 };
 
-/// Delete currently selected lines.
 struct edit_line_delete : public validate_sel_nonempty {
 	CMD_NAME("edit/line/delete")
 	STR_MENU("De&lete Lines")
@@ -611,7 +599,6 @@ static void duplicate_lines(agi::Context *c, Func&& shift) {
 	c->selectionController->SetSelectionAndActive(new_sel, new_active);
 }
 
-/// Duplicate the selected lines.
 struct edit_line_duplicate : public validate_sel_nonempty {
 	CMD_NAME("edit/line/duplicate")
 	STR_MENU("&Duplicate Lines")
@@ -623,7 +610,6 @@ struct edit_line_duplicate : public validate_sel_nonempty {
 	}
 };
 
-/// Duplicate lines and shift by one frame.
 struct edit_line_duplicate_shift : public Command {
 	CMD_NAME("edit/line/duplicate/shift")
 	STR_MENU("D&uplicate and Shift by 1 Frame")
@@ -698,7 +684,6 @@ static void combine_concat(AssDialogue *first, AssDialogue *second) {
 
 static void combine_drop(AssDialogue *, AssDialogue *) { }
 
-/// Joins selected lines in a single one, as karaoke.
 struct edit_line_join_as_karaoke : public validate_sel_multiple {
 	CMD_NAME("edit/line/join/as_karaoke")
 	STR_MENU("As &Karaoke")
@@ -710,8 +695,6 @@ struct edit_line_join_as_karaoke : public validate_sel_multiple {
 	}
 };
 
-
-/// Joins selected lines in a single one, concatenating text together.
 struct edit_line_join_concatenate : public validate_sel_multiple {
 	CMD_NAME("edit/line/join/concatenate")
 	STR_MENU("&Concatenate")
@@ -723,8 +706,6 @@ struct edit_line_join_concatenate : public validate_sel_multiple {
 	}
 };
 
-
-/// Joins selected lines in a single one, keeping text of first and discarding remaining.
 struct edit_line_join_keep_first : public validate_sel_multiple {
 	CMD_NAME("edit/line/join/keep_first")
 	STR_MENU("Keep &First")
@@ -767,7 +748,6 @@ static bool try_paste_lines(agi::Context *c) {
 	return true;
 }
 
-/// Paste subtitles.
 struct edit_line_paste : public Command {
 	CMD_NAME("edit/line/paste")
 	STR_MENU("&Paste Lines")
@@ -799,7 +779,6 @@ struct edit_line_paste : public Command {
 	}
 };
 
-/// Paste subtitles over others.
 struct edit_line_paste_over : public Command {
 	CMD_NAME("edit/line/paste/over")
 	STR_MENU("Paste Lines &Over...")
@@ -892,7 +871,6 @@ bool check_end(AssDialogue *d1, AssDialogue *d2) {
 
 }
 
-/// Recombine subtitles when they have been split and merged.
 struct edit_line_recombine : public validate_sel_multiple {
 	CMD_NAME("edit/line/recombine")
 	STR_MENU("Recom&bine Lines")
@@ -968,8 +946,6 @@ struct edit_line_recombine : public validate_sel_multiple {
 	}
 };
 
-
-/// Uses karaoke timing to split line into multiple smaller lines.
 struct edit_line_split_by_karaoke : public validate_sel_nonempty {
 	CMD_NAME("edit/line/split/by_karaoke")
 	STR_MENU("Split Lines (by karaoke)")
@@ -1022,7 +998,6 @@ struct edit_line_split_preserve : public validate_sel_nonempty {
 	}
 };
 
-/// Redoes last action.
 struct edit_redo : public Command {
 	CMD_NAME("edit/redo")
 	STR_HELP("Redo last undone action")
@@ -1048,7 +1023,6 @@ struct edit_redo : public Command {
 	}
 };
 
-/// Undoes last action.
 struct edit_undo : public Command {
 	CMD_NAME("edit/undo")
 	STR_HELP("Undo last action")
@@ -1135,7 +1109,6 @@ struct edit_insert_original : public Command {
 };
 
 }
-/// @}
 
 namespace cmd {
 	void init_edit() {
diff --git a/aegisub/src/command/grid.cpp b/aegisub/src/command/grid.cpp
index 106d3ac4b..33d435459 100644
--- a/aegisub/src/command/grid.cpp
+++ b/aegisub/src/command/grid.cpp
@@ -29,11 +29,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file grid.cpp
-/// @brief grid/ commands.
-/// @ingroup command
-///
-
 #include "../config.h"
 
 #include "command.h"
@@ -51,10 +46,7 @@
 
 namespace {
 	using cmd::Command;
-/// @defgroup cmd-grid Subtitle grid commands.
-/// @{
 
-/// Move to the next subtitle line.
 struct grid_line_next : public Command {
 	CMD_NAME("grid/line/next")
 	STR_MENU("Next Line")
@@ -66,7 +58,6 @@ struct grid_line_next : public Command {
 	}
 };
 
-/// Move to the next subtitle line, creating it if needed
 struct grid_line_next_create : public Command {
 	CMD_NAME("grid/line/next/create")
 	STR_MENU("Next Line")
@@ -94,7 +85,6 @@ struct grid_line_next_create : public Command {
 	}
 };
 
-/// Move to the previous line.
 struct grid_line_prev : public Command {
 	CMD_NAME("grid/line/prev")
 	STR_MENU("Previous Line")
@@ -106,7 +96,6 @@ struct grid_line_prev : public Command {
 	}
 };
 
-/// Sort all subtitles by their actor names
 struct grid_sort_actor : public Command {
 	CMD_NAME("grid/sort/actor")
 	STR_MENU("&Actor Name")
@@ -127,7 +116,6 @@ struct validate_sel_multiple : public Command {
 	}
 };
 
-/// Sort all selected subtitles by their actor names
 struct grid_sort_actor_selected : public validate_sel_multiple {
 	CMD_NAME("grid/sort/actor/selected")
 	STR_MENU("&Actor Name")
@@ -140,7 +128,6 @@ struct grid_sort_actor_selected : public validate_sel_multiple {
 	}
 };
 
-/// Sort all subtitles by their effects
 struct grid_sort_effect : public Command {
 	CMD_NAME("grid/sort/effect")
 	STR_MENU("&Effect")
@@ -153,7 +140,6 @@ struct grid_sort_effect : public Command {
 	}
 };
 
-/// Sort all selected subtitles by their effects
 struct grid_sort_effect_selected : public validate_sel_multiple {
 	CMD_NAME("grid/sort/effect/selected")
 	STR_MENU("&Effect")
@@ -166,7 +152,6 @@ struct grid_sort_effect_selected : public validate_sel_multiple {
 	}
 };
 
-/// Sort all subtitles by their end times.
 struct grid_sort_end : public Command {
 	CMD_NAME("grid/sort/end")
 	STR_MENU("&End Time")
@@ -179,7 +164,6 @@ struct grid_sort_end : public Command {
 	}
 };
 
-/// Sort all selected subtitles by their end times.
 struct grid_sort_end_selected : public validate_sel_multiple {
 	CMD_NAME("grid/sort/end/selected")
 	STR_MENU("&End Time")
@@ -192,7 +176,6 @@ struct grid_sort_end_selected : public validate_sel_multiple {
 	}
 };
 
-/// Sort all subtitles by their layer number.
 struct grid_sort_layer : public Command {
 	CMD_NAME("grid/sort/layer")
 	STR_MENU("&Layer")
@@ -205,7 +188,6 @@ struct grid_sort_layer : public Command {
 	}
 };
 
-/// Sort all selected subtitles by their layer number.
 struct grid_sort_layer_selected : public validate_sel_multiple {
 	CMD_NAME("grid/sort/layer/selected")
 	STR_MENU("&Layer")
@@ -218,7 +200,6 @@ struct grid_sort_layer_selected : public validate_sel_multiple {
 	}
 };
 
-/// Sort all subtitles by their start times.
 struct grid_sort_start : public Command {
 	CMD_NAME("grid/sort/start")
 	STR_MENU("&Start Time")
@@ -231,7 +212,6 @@ struct grid_sort_start : public Command {
 	}
 };
 
-/// Sort all selected subtitles by their start times.
 struct grid_sort_start_selected : public validate_sel_multiple {
 	CMD_NAME("grid/sort/start/selected")
 	STR_MENU("&Start Time")
@@ -244,7 +224,6 @@ struct grid_sort_start_selected : public validate_sel_multiple {
 	}
 };
 
-/// Sort all subtitles by their style names
 struct grid_sort_style : public Command {
 	CMD_NAME("grid/sort/style")
 	STR_MENU("St&yle Name")
@@ -257,7 +236,6 @@ struct grid_sort_style : public Command {
 	}
 };
 
-/// Sort all selected subtitles by their style names
 struct grid_sort_style_selected : public validate_sel_multiple {
 	CMD_NAME("grid/sort/style/selected")
 	STR_MENU("St&yle Name")
@@ -270,7 +248,6 @@ struct grid_sort_style_selected : public validate_sel_multiple {
 	}
 };
 
-/// Cycle through tag hiding modes.
 struct grid_tag_cycle_hiding : public Command {
 	CMD_NAME("grid/tag/cycle_hiding")
 	STR_MENU("Cycle Tag Hiding Mode")
@@ -295,8 +272,6 @@ struct grid_tag_cycle_hiding : public Command {
 	}
 };
 
-
-/// Hide override tags in the subtitle grid.
 struct grid_tags_hide : public Command {
 	CMD_NAME("grid/tags/hide")
 	STR_MENU("&Hide Tags")
@@ -313,8 +288,6 @@ struct grid_tags_hide : public Command {
 	}
 };
 
-
-/// Show full override tags in the subtitle grid.
 struct grid_tags_show : public Command {
 	CMD_NAME("grid/tags/show")
 	STR_MENU("Sh&ow Tags")
@@ -331,8 +304,6 @@ struct grid_tags_show : public Command {
 	}
 };
 
-
-/// Replace override tags in the subtitle grid with a simplified placeholder.
 struct grid_tags_simplify : public Command {
 	CMD_NAME("grid/tags/simplify")
 	STR_MENU("S&implify Tags")
@@ -370,7 +341,6 @@ static bool move_one(T begin, T end, U const& to_move, int step) {
 	return move_count > 0;
 }
 
-/// Move the selected lines up one row
 struct grid_move_up : public Command {
 	CMD_NAME("grid/move/up")
 	STR_MENU("Move line up")
@@ -388,7 +358,6 @@ struct grid_move_up : public Command {
 	}
 };
 
-/// Move the selected lines down one row
 struct grid_move_down : public Command {
 	CMD_NAME("grid/move/down")
 	STR_MENU("Move line down")
@@ -406,7 +375,6 @@ struct grid_move_down : public Command {
 	}
 };
 
-/// Swaps the two selected lines.
 struct grid_swap : public Command {
 	CMD_NAME("grid/swap")
 	STR_MENU("Swap Lines")
@@ -428,7 +396,6 @@ struct grid_swap : public Command {
 };
 
 }
-/// @}
 
 namespace cmd {
 	void init_grid() {
diff --git a/aegisub/src/command/help.cpp b/aegisub/src/command/help.cpp
index b9e8d9029..5b69da57f 100644
--- a/aegisub/src/command/help.cpp
+++ b/aegisub/src/command/help.cpp
@@ -29,11 +29,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file help.cpp
-/// @brief help/ commands
-/// @ingroup command
-///
-
 #include "../config.h"
 
 #include "command.h"
@@ -49,10 +44,7 @@
 
 namespace {
 	using cmd::Command;
-/// @defgroup cmd-help Help commands.
-/// @{
 
-/// Visit Aegisub's bug tracker.
 struct help_bugs : public Command {
 	CMD_NAME("help/bugs")
 	STR_MENU("&Bug Tracker...")
@@ -73,8 +65,6 @@ struct help_bugs : public Command {
 	}
 };
 
-
-/// Help topics.
 struct help_contents : public Command {
 	CMD_NAME("help/contents")
 	STR_MENU("&Contents")
@@ -87,7 +77,6 @@ struct help_contents : public Command {
 };
 
 #ifdef __WXMAC__
-/// Resource files.
 struct help_files : public Command {
 	CMD_NAME("help/files")
 	STR_MENU("All Fil&es")
@@ -100,7 +89,6 @@ struct help_files : public Command {
 };
 #endif
 
-/// Visit Aegisub's forums.
 struct help_forums : public Command {
 	CMD_NAME("help/forums")
 	STR_MENU("&Forums")
@@ -112,8 +100,6 @@ struct help_forums : public Command {
 	}
 };
 
-
-/// Visit Aegisub's official IRC channel.
 struct help_irc : public Command {
 	CMD_NAME("help/irc")
 	STR_MENU("&IRC Channel")
@@ -125,7 +111,6 @@ struct help_irc : public Command {
 	}
 };
 
-/// Open the manual page for Visual Typesetting.
 struct help_video : public Command {
 	CMD_NAME("help/video")
 	STR_MENU("&Visual Typesetting")
@@ -137,7 +122,6 @@ struct help_video : public Command {
 	}
 };
 
-/// Visit Aegisub's official website.
 struct help_website : public Command {
 	CMD_NAME("help/website")
 	STR_MENU("&Website")
@@ -149,7 +133,6 @@ struct help_website : public Command {
 	}
 };
 }
-/// @}
 
 namespace cmd {
 	void init_help() {
diff --git a/aegisub/src/command/icon.cpp b/aegisub/src/command/icon.cpp
index 155d5dd20..de08b0a71 100644
--- a/aegisub/src/command/icon.cpp
+++ b/aegisub/src/command/icon.cpp
@@ -12,10 +12,6 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-/// @file icon.h
-/// @brief Icon for commands.
-/// @ingroup command
-
 #include "../config.h"
 
 #include "icon.h"
diff --git a/aegisub/src/command/keyframe.cpp b/aegisub/src/command/keyframe.cpp
index 0e6003e16..30cab8f11 100644
--- a/aegisub/src/command/keyframe.cpp
+++ b/aegisub/src/command/keyframe.cpp
@@ -29,11 +29,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file keyframe.cpp
-/// @brief keyframe/ commands.
-/// @ingroup command
-///
-
 #include "../config.h"
 
 #include "command.h"
@@ -47,10 +42,7 @@
 
 namespace {
 	using cmd::Command;
-/// @defgroup cmd-keyframed Keyframe commands.
-/// @{
 
-/// Closes the currently open keyframes list.
 struct keyframe_close : public Command {
 	CMD_NAME("keyframe/close")
 	STR_MENU("Close Keyframes")
@@ -67,7 +59,6 @@ struct keyframe_close : public Command {
 	}
 };
 
-/// Opens a keyframe list file.
 struct keyframe_open : public Command {
 	CMD_NAME("keyframe/open")
 	STR_MENU("Open Keyframes...")
@@ -86,7 +77,6 @@ struct keyframe_open : public Command {
 	}
 };
 
-/// Saves the current keyframe list.
 struct keyframe_save : public Command {
 	CMD_NAME("keyframe/save")
 	STR_MENU("Save Keyframes...")
@@ -105,7 +95,6 @@ struct keyframe_save : public Command {
 	}
 };
 }
-/// @}
 
 namespace cmd {
 	void init_keyframe() {
diff --git a/aegisub/src/command/recent.cpp b/aegisub/src/command/recent.cpp
index 3a665b8b5..5690a404f 100644
--- a/aegisub/src/command/recent.cpp
+++ b/aegisub/src/command/recent.cpp
@@ -27,11 +27,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file recent.cpp
-/// @brief recent/ commands, rebuild MRU-based lists.
-/// @ingroup command
-///
-
 #include "../config.h"
 
 #include "command.h"
@@ -51,8 +46,6 @@
 
 namespace {
 	using cmd::Command;
-/// @defgroup cmd-recent MRU (Most Recently Used) commands.
-/// @{
 
 COMMAND_GROUP(recent_audio,     "recent/audio",     _("Recent"), _("Recent"), _("Open recent audio"));
 COMMAND_GROUP(recent_keyframes, "recent/keyframe",  _("Recent"), _("Recent"), _("Open recent keyframes"));
@@ -122,8 +115,6 @@ struct recent_video_entry : public Command {
 	}
 };
 
-/// @class mru_wrapper
-/// @brief Wrapper class for mru commands to
 template<class T>
 class mru_wrapper : public T {
 	int id;
@@ -136,7 +127,6 @@ public:
 	mru_wrapper(int id) : id(id) , full_name(T::name() + std::to_string(id)) { }
 };
 }
-/// @}
 
 namespace cmd {
 	void init_recent() {
@@ -146,7 +136,6 @@ namespace cmd {
 		reg(agi::util::make_unique<recent_timecodes>());
 		reg(agi::util::make_unique<recent_video>());
 
-		/// @todo 16 is an implementation detail that maybe needs to be exposed
 		for (int i = 0; i < 16; ++i) {
 			reg(agi::util::make_unique<mru_wrapper<recent_audio_entry>>(i));
 			reg(agi::util::make_unique<mru_wrapper<recent_keyframes_entry>>(i));
diff --git a/aegisub/src/command/subtitle.cpp b/aegisub/src/command/subtitle.cpp
index c1345a963..c096db04f 100644
--- a/aegisub/src/command/subtitle.cpp
+++ b/aegisub/src/command/subtitle.cpp
@@ -29,11 +29,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file subtitle.cpp
-/// @brief subtitle/ commands.
-/// @ingroup command
-///
-
 #include "../config.h"
 
 #include "command.h"
@@ -65,8 +60,6 @@
 
 namespace {
 	using cmd::Command;
-/// @defgroup cmd-subtitle Subtitle commands.
-/// @{
 
 struct validate_nonempty_selection : public Command {
 	CMD_TYPE(COMMAND_VALIDATE)
@@ -82,7 +75,6 @@ struct validate_nonempty_selection_video_loaded : public Command {
 	}
 };
 
-/// Open the attachment list.
 struct subtitle_attachment : public Command {
 	CMD_NAME("subtitle/attachment")
 	STR_MENU("A&ttachments...")
@@ -95,8 +87,6 @@ struct subtitle_attachment : public Command {
 	}
 };
 
-
-/// Find words in subtitles.
 struct subtitle_find : public Command {
 	CMD_NAME("subtitle/find")
 	STR_MENU("&Find...")
@@ -109,7 +99,6 @@ struct subtitle_find : public Command {
 	}
 };
 
-/// Find next match of last word.
 struct subtitle_find_next : public Command {
 	CMD_NAME("subtitle/find/next")
 	STR_MENU("Find &Next")
@@ -141,7 +130,6 @@ static void insert_subtitle_at_video(agi::Context *c, bool after) {
 	c->selectionController->SetSelectionAndActive(sel, def);
 }
 
-/// Inserts a line after current.
 struct subtitle_insert_after : public validate_nonempty_selection {
 	CMD_NAME("subtitle/insert/after")
 	STR_MENU("&After Current")
@@ -178,7 +166,6 @@ struct subtitle_insert_after : public validate_nonempty_selection {
 	}
 };
 
-/// Inserts a line after current, starting at video time.
 struct subtitle_insert_after_videotime : public validate_nonempty_selection_video_loaded {
 	CMD_NAME("subtitle/insert/after/videotime")
 	STR_MENU("After Current, at Video Time")
@@ -190,8 +177,6 @@ struct subtitle_insert_after_videotime : public validate_nonempty_selection_vide
 	}
 };
 
-
-/// Inserts a line before current.
 struct subtitle_insert_before : public validate_nonempty_selection {
 	CMD_NAME("subtitle/insert/before")
 	STR_MENU("&Before Current")
@@ -225,8 +210,6 @@ struct subtitle_insert_before : public validate_nonempty_selection {
 	}
 };
 
-
-/// Inserts a line before current, starting at video time.
 struct subtitle_insert_before_videotime : public validate_nonempty_selection_video_loaded {
 	CMD_NAME("subtitle/insert/before/videotime")
 	STR_MENU("Before Current, at Video Time")
@@ -238,8 +221,6 @@ struct subtitle_insert_before_videotime : public validate_nonempty_selection_vid
 	}
 };
 
-
-/// New subtitles.
 struct subtitle_new : public Command {
 	CMD_NAME("subtitle/new")
 	STR_MENU("&New Subtitles")
@@ -252,8 +233,6 @@ struct subtitle_new : public Command {
 	}
 };
 
-
-/// Opens a subtitles file.
 struct subtitle_open : public Command {
 	CMD_NAME("subtitle/open")
 	STR_MENU("&Open Subtitles...")
@@ -282,7 +261,6 @@ struct subtitle_open_autosave : public Command {
 	}
 };
 
-/// Opens a subtitles file with a specific charset.
 struct subtitle_open_charset : public Command {
 	CMD_NAME("subtitle/open/charset")
 	STR_MENU("Open Subtitles with &Charset...")
@@ -302,7 +280,6 @@ struct subtitle_open_charset : public Command {
 	}
 };
 
-/// Opens the subtitles from the current video file.
 struct subtitle_open_video : public Command {
 	CMD_NAME("subtitle/open/video")
 	STR_MENU("Open Subtitles from &Video")
@@ -320,8 +297,6 @@ struct subtitle_open_video : public Command {
 	}
 };
 
-
-/// Open script properties window.
 struct subtitle_properties : public Command {
 	CMD_NAME("subtitle/properties")
 	STR_MENU("&Properties...")
@@ -357,7 +332,6 @@ static void save_subtitles(agi::Context *c, agi::fs::path filename) {
 	}
 }
 
-/// Saves subtitles.
 struct subtitle_save : public Command {
 	CMD_NAME("subtitle/save")
 	STR_MENU("&Save Subtitles")
@@ -374,8 +348,6 @@ struct subtitle_save : public Command {
 	}
 };
 
-
-/// Saves subtitles with another name.
 struct subtitle_save_as : public Command {
 	CMD_NAME("subtitle/save/as")
 	STR_MENU("Save Subtitles &as...")
@@ -387,7 +359,6 @@ struct subtitle_save_as : public Command {
 	}
 };
 
-/// Selects all dialogue lines
 struct subtitle_select_all : public Command {
 	CMD_NAME("subtitle/select/all")
 	STR_MENU("Select &All")
@@ -403,7 +374,6 @@ struct subtitle_select_all : public Command {
 	}
 };
 
-/// Selects all lines that are currently visible on video frame.
 struct subtitle_select_visible : public Command {
 	CMD_NAME("subtitle/select/visible")
 	STR_MENU("Select Visible")
@@ -438,8 +408,6 @@ struct subtitle_select_visible : public Command {
 	}
 };
 
-
-/// Open spell checker.
 struct subtitle_spellcheck : public Command {
 	CMD_NAME("subtitle/spellcheck")
 	STR_MENU("Spell &Checker...")
@@ -453,8 +421,6 @@ struct subtitle_spellcheck : public Command {
 };
 }
 
-/// @}
-
 namespace cmd {
 	void init_subtitle() {
 		reg(agi::util::make_unique<subtitle_attachment>());
diff --git a/aegisub/src/command/time.cpp b/aegisub/src/command/time.cpp
index fa2c7e7ee..e3cc11bbf 100644
--- a/aegisub/src/command/time.cpp
+++ b/aegisub/src/command/time.cpp
@@ -29,11 +29,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file time.cpp
-/// @brief time/ commands.
-/// @ingroup command
-///
-
 #include "../config.h"
 
 #include "command.h"
@@ -83,9 +78,6 @@ namespace {
 		}
 	};
 
-/// @defgroup cmd-time Time manipulation commands.
-/// @{
-
 static void adjoin_lines(agi::Context *c, bool set_start) {
 	auto sel = c->selectionController->GetSelectedSet();
 	AssDialogue *prev = nullptr;
@@ -114,7 +106,6 @@ static void adjoin_lines(agi::Context *c, bool set_start) {
 	c->ass->Commit(_("adjoin"), AssFile::COMMIT_DIAG_TIME);
 }
 
-/// Changes times of subs so end times begin on next's start time.
 struct time_continuous_end : public validate_adjoinable {
 	CMD_NAME("time/continuous/end")
 	STR_MENU("Change &End")
@@ -126,7 +117,6 @@ struct time_continuous_end : public validate_adjoinable {
 	}
 };
 
-/// Changes times of subs so start times begin on previous's end time.
 struct time_continuous_start : public validate_adjoinable {
 	CMD_NAME("time/continuous/start")
 	STR_MENU("Change &Start")
@@ -138,8 +128,6 @@ struct time_continuous_start : public validate_adjoinable {
 	}
 };
 
-
-/// Shift selection so that the active line starts at current frame.
 struct time_frame_current : public validate_video_loaded {
 	CMD_NAME("time/frame/current")
 	STR_MENU("Shift to &Current Frame")
@@ -166,8 +154,6 @@ struct time_frame_current : public validate_video_loaded {
 	}
 };
 
-
-/// Shift subtitles by time or frames.
 struct time_shift : public Command {
 	CMD_NAME("time/shift")
 	STR_MENU("S&hift Times...")
@@ -197,7 +183,6 @@ static void snap_subs_video(agi::Context *c, bool set_start) {
 	c->ass->Commit(_("timing"), AssFile::COMMIT_DIAG_TIME);
 }
 
-/// Set end of selected subtitles to current video frame.
 struct time_snap_end_video : public validate_video_loaded {
 	CMD_NAME("time/snap/end_video")
 	STR_MENU("Snap &End to Video")
@@ -209,7 +194,6 @@ struct time_snap_end_video : public validate_video_loaded {
 	}
 };
 
-/// Set start and end of subtitles to the keyframes around current video frame.
 struct time_snap_scene : public validate_video_loaded {
 	CMD_NAME("time/snap/scene")
 	STR_MENU("Snap to S&cene")
@@ -356,7 +340,6 @@ struct time_start_decrease : public Command {
 	}
 };
 
-/// Set start of selected subtitles to current video frame.
 struct time_snap_start_video : public validate_video_loaded {
 	CMD_NAME("time/snap/start_video")
 	STR_MENU("Snap &Start to Video")
@@ -368,7 +351,6 @@ struct time_snap_start_video : public validate_video_loaded {
 	}
 };
 
-/// Switch to the next timeable thing (line or syllable)
 struct time_next : public Command {
 	CMD_NAME("time/next")
 	STR_MENU("Next Line")
@@ -380,7 +362,6 @@ struct time_next : public Command {
 	}
 };
 
-/// Switch to the previous timeable thing (line or syllable)
 struct time_prev : public Command {
 	CMD_NAME("time/prev")
 	STR_MENU("Previous Line")
@@ -393,8 +374,6 @@ struct time_prev : public Command {
 };
 }
 
-/// @}
-
 namespace cmd {
 	void init_time() {
 		reg(agi::util::make_unique<time_add_lead_both>());
diff --git a/aegisub/src/command/timecode.cpp b/aegisub/src/command/timecode.cpp
index 7cf4faa78..1de8c85dd 100644
--- a/aegisub/src/command/timecode.cpp
+++ b/aegisub/src/command/timecode.cpp
@@ -29,11 +29,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file timecode.cpp
-/// @brief timecode/ commands.
-/// @ingroup command
-///
-
 #include "../config.h"
 
 #include "command.h"
@@ -47,10 +42,7 @@
 
 namespace {
 	using cmd::Command;
-/// @defgroup cmd-timecode Timecode commands.
-/// @{
 
-/// Closes the currently open timecodes file.
 struct timecode_close : public Command {
 	CMD_NAME("timecode/close")
 	STR_MENU("Close Timecodes File")
@@ -67,8 +59,6 @@ struct timecode_close : public Command {
 	}
 };
 
-
-/// Opens a VFR timecodes v1 or v2 file.
 struct timecode_open : public Command {
 	CMD_NAME("timecode/open")
 	STR_MENU("Open Timecodes File...")
@@ -83,7 +73,6 @@ struct timecode_open : public Command {
 	}
 };
 
-/// Saves a VFR timecodes v2 file.
 struct timecode_save : public Command {
 	CMD_NAME("timecode/save")
 	STR_MENU("Save Timecodes File...")
@@ -103,7 +92,6 @@ struct timecode_save : public Command {
 	}
 };
 }
-/// @}
 
 namespace cmd {
 	void init_timecode() {
diff --git a/aegisub/src/command/tool.cpp b/aegisub/src/command/tool.cpp
index 94a70c8ae..e89cd1050 100644
--- a/aegisub/src/command/tool.cpp
+++ b/aegisub/src/command/tool.cpp
@@ -29,11 +29,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file tool.cpp
-/// @brief tool/ commands.
-/// @ingroup command
-///
-
 #include "../config.h"
 
 #include "command.h"
@@ -63,11 +58,7 @@
 
 namespace {
 	using cmd::Command;
-/// @defgroup cmd-tool Various tool and utilities
-/// @{
 
-
-/// Launch ASSDraw3 tool for vector drawing.
 struct tool_assdraw : public Command {
 	CMD_NAME("tool/assdraw")
 	STR_MENU("ASSDraw3...")
@@ -79,7 +70,6 @@ struct tool_assdraw : public Command {
 	}
 };
 
-/// Saves a copy of subtitles with processing applied to it.
 struct tool_export : public Command {
 	CMD_NAME("tool/export")
 	STR_MENU("&Export Subtitles...")
@@ -92,7 +82,6 @@ struct tool_export : public Command {
 	}
 };
 
-/// Open fonts collector.
 struct tool_font_collector : public Command {
 	CMD_NAME("tool/font_collector")
 	STR_MENU("&Fonts Collector...")
@@ -104,7 +93,6 @@ struct tool_font_collector : public Command {
 	}
 };
 
-/// Selects lines based on defined criteria.
 struct tool_line_select : public Command {
 	CMD_NAME("tool/line/select")
 	STR_MENU("S&elect Lines...")
@@ -116,7 +104,6 @@ struct tool_line_select : public Command {
 	}
 };
 
-/// Changes resolution and modifies subtitles to conform to change.
 struct tool_resampleres : public Command {
 	CMD_NAME("tool/resampleres")
 	STR_MENU("&Resample Resolution...")
@@ -131,7 +118,6 @@ struct tool_resampleres : public Command {
 	}
 };
 
-/// Open styling assistant.
 struct tool_style_assistant : public Command {
 	CMD_NAME("tool/style/assistant")
 	STR_MENU("St&yling Assistant...")
@@ -151,7 +137,6 @@ struct tool_styling_assistant_validator : public Command {
 	}
 };
 
-/// Commit changes and move to the next line.
 struct tool_styling_assistant_commit : public tool_styling_assistant_validator {
 	CMD_NAME("tool/styling_assistant/commit")
 	STR_MENU("&Accept changes")
@@ -163,7 +148,6 @@ struct tool_styling_assistant_commit : public tool_styling_assistant_validator {
 	}
 };
 
-/// Commit changes and stay on the current line.
 struct tool_styling_assistant_preview : public tool_styling_assistant_validator {
 	CMD_NAME("tool/styling_assistant/preview")
 	STR_MENU("&Preview changes")
@@ -175,7 +159,6 @@ struct tool_styling_assistant_preview : public tool_styling_assistant_validator
 	}
 };
 
-/// Open styles manager.
 struct tool_style_manager : public Command {
 	CMD_NAME("tool/style/manager")
 	STR_MENU("&Styles Manager...")
@@ -187,7 +170,6 @@ struct tool_style_manager : public Command {
 	}
 };
 
-/// Open Kanji timer.
 struct tool_time_kanji : public Command {
 	CMD_NAME("tool/time/kanji")
 	STR_MENU("&Kanji Timer...")
@@ -199,7 +181,6 @@ struct tool_time_kanji : public Command {
 	}
 };
 
-/// Launch timing post-processor.
 struct tool_time_postprocess : public Command {
 	CMD_NAME("tool/time/postprocess")
 	STR_MENU("&Timing Post-Processor...")
@@ -211,7 +192,6 @@ struct tool_time_postprocess : public Command {
 	}
 };
 
-/// Open translation assistant.
 struct tool_translation_assistant : public Command {
 	CMD_NAME("tool/translation_assistant")
 	STR_MENU("&Translation Assistant...")
@@ -237,7 +217,6 @@ struct tool_translation_assistant_validator : public Command {
 	}
 };
 
-/// Commit changes and move to the next line.
 struct tool_translation_assistant_commit : public tool_translation_assistant_validator {
 	CMD_NAME("tool/translation_assistant/commit")
 	STR_MENU("&Accept changes")
@@ -249,7 +228,6 @@ struct tool_translation_assistant_commit : public tool_translation_assistant_val
 	}
 };
 
-/// Commit changes and stay on the current line.
 struct tool_translation_assistant_preview : public tool_translation_assistant_validator {
 	CMD_NAME("tool/translation_assistant/preview")
 	STR_MENU("&Preview changes")
@@ -261,7 +239,6 @@ struct tool_translation_assistant_preview : public tool_translation_assistant_va
 	}
 };
 
-/// Move to the next line without committing changes.
 struct tool_translation_assistant_next : public tool_translation_assistant_validator {
 	CMD_NAME("tool/translation_assistant/next")
 	STR_MENU("&Next Line")
@@ -273,7 +250,6 @@ struct tool_translation_assistant_next : public tool_translation_assistant_valid
 	}
 };
 
-/// Move to the previous line without committing changes.
 struct tool_translation_assistant_prev : public tool_translation_assistant_validator {
 	CMD_NAME("tool/translation_assistant/prev")
 	STR_MENU("&Previous Line")
@@ -286,7 +262,6 @@ struct tool_translation_assistant_prev : public tool_translation_assistant_valid
 };
 }
 
-/// Insert the untranslated text.
 struct tool_translation_assistant_insert : public tool_translation_assistant_validator {
 	CMD_NAME("tool/translation_assistant/insert_original")
 	STR_MENU("&Insert Original")
@@ -297,7 +272,6 @@ struct tool_translation_assistant_insert : public tool_translation_assistant_val
 		c->dialog->Get<DialogTranslation>()->InsertOriginal();
 	}
 };
-/// @}
 
 namespace cmd {
 	void init_tool() {
diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp
index 5e3994714..0a96945ca 100644
--- a/aegisub/src/command/video.cpp
+++ b/aegisub/src/command/video.cpp
@@ -29,11 +29,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file video.cpp
-/// @brief video/ commands.
-/// @ingroup command
-///
-
 #include "../config.h"
 
 #include "command.h"
@@ -74,8 +69,6 @@
 
 namespace {
 	using cmd::Command;
-/// @defgroup cmd-video Video commands.
-/// @{
 
 struct validator_video_loaded : public Command {
 	CMD_TYPE(COMMAND_VALIDATE)
@@ -91,7 +84,6 @@ struct validator_video_attached : public Command {
 	}
 };
 
-/// Forces video to 2.35 aspect ratio.
 struct video_aspect_cinematic : public validator_video_loaded {
 	CMD_NAME("video/aspect/cinematic")
 	STR_MENU("&Cinematic (2.35)")
@@ -110,7 +102,6 @@ struct video_aspect_cinematic : public validator_video_loaded {
 	}
 };
 
-/// Forces video to a custom aspect ratio.
 struct video_aspect_custom : public validator_video_loaded {
 	CMD_NAME("video/aspect/custom")
 	STR_MENU("C&ustom...")
@@ -154,7 +145,6 @@ struct video_aspect_custom : public validator_video_loaded {
 	}
 };
 
-/// Leave video on original aspect ratio.
 struct video_aspect_default : public validator_video_loaded {
 	CMD_NAME("video/aspect/default")
 	STR_MENU("&Default")
@@ -173,7 +163,6 @@ struct video_aspect_default : public validator_video_loaded {
 	}
 };
 
-/// Forces video to 4:3 aspect ratio.
 struct video_aspect_full : public validator_video_loaded {
 	CMD_NAME("video/aspect/full")
 	STR_MENU("&Fullscreen (4:3)")
@@ -192,7 +181,6 @@ struct video_aspect_full : public validator_video_loaded {
 	}
 };
 
-/// Forces video to 16:9 aspect ratio.
 struct video_aspect_wide : public validator_video_loaded {
 	CMD_NAME("video/aspect/wide")
 	STR_MENU("&Widescreen (16:9)")
@@ -211,7 +199,6 @@ struct video_aspect_wide : public validator_video_loaded {
 	}
 };
 
-/// Closes the currently open video file.
 struct video_close : public validator_video_loaded {
 	CMD_NAME("video/close")
 	STR_MENU("&Close Video")
@@ -223,7 +210,6 @@ struct video_close : public validator_video_loaded {
 	}
 };
 
-/// Copy the current coordinates of the mouse over the video to the clipboard.
 struct video_copy_coordinates : public validator_video_loaded {
 	CMD_NAME("video/copy_coordinates")
 	STR_MENU("Copy coordinates to Clipboard")
@@ -254,7 +240,6 @@ struct video_cycle_subtitles_provider : public cmd::Command {
 	}
 };
 
-/// Detach video, displaying it in a separate Window.
 struct video_detach : public validator_video_loaded {
 	CMD_NAME("video/detach")
 	STR_MENU("&Detach Video")
@@ -274,7 +259,6 @@ struct video_detach : public validator_video_loaded {
 	}
 };
 
-/// Shows video details.
 struct video_details : public validator_video_loaded {
 	CMD_NAME("video/details")
 	STR_MENU("Show &Video Details")
@@ -287,7 +271,6 @@ struct video_details : public validator_video_loaded {
 	}
 };
 
-/// Toggle focus between the video slider and other things
 struct video_focus_seek : public validator_video_loaded {
 	CMD_NAME("video/focus_seek")
 	STR_MENU("Toggle video slider focus")
@@ -306,7 +289,6 @@ struct video_focus_seek : public validator_video_loaded {
 	}
 };
 
-/// Copy the current video frame to the clipboard, with subtitles
 struct video_frame_copy : public validator_video_loaded {
 	CMD_NAME("video/frame/copy")
 	STR_MENU("Copy image to Clipboard")
@@ -318,7 +300,6 @@ struct video_frame_copy : public validator_video_loaded {
 	}
 };
 
-/// Copy the current video frame to the clipboard, without subtitles
 struct video_frame_copy_raw : public validator_video_loaded {
 	CMD_NAME("video/frame/copy/raw")
 	STR_MENU("Copy image to Clipboard (no subtitles)")
@@ -330,7 +311,6 @@ struct video_frame_copy_raw : public validator_video_loaded {
 	}
 };
 
-/// Seek to the next frame.
 struct video_frame_next : public validator_video_loaded {
 	CMD_NAME("video/frame/next")
 	STR_MENU("Next Frame")
@@ -342,7 +322,6 @@ struct video_frame_next : public validator_video_loaded {
 	}
 };
 
-/// Seek to the next subtitle boundary.
 struct video_frame_next_boundary : public validator_video_loaded {
 	CMD_NAME("video/frame/next/boundary")
 	STR_MENU("Next Boundary")
@@ -372,7 +351,6 @@ struct video_frame_next_boundary : public validator_video_loaded {
 	}
 };
 
-/// Seek to the next keyframe.
 struct video_frame_next_keyframe : public validator_video_loaded {
 	CMD_NAME("video/frame/next/keyframe")
 	STR_MENU("Next Keyframe")
@@ -387,7 +365,6 @@ struct video_frame_next_keyframe : public validator_video_loaded {
 	}
 };
 
-/// Fast jump forward
 struct video_frame_next_large : public validator_video_loaded {
 	CMD_NAME("video/frame/next/large")
 	STR_MENU("Fast jump forward")
@@ -401,7 +378,6 @@ struct video_frame_next_large : public validator_video_loaded {
 	}
 };
 
-/// Seek to the previous frame.
 struct video_frame_prev : public validator_video_loaded {
 	CMD_NAME("video/frame/prev")
 	STR_MENU("Previous Frame")
@@ -413,7 +389,6 @@ struct video_frame_prev : public validator_video_loaded {
 	}
 };
 
-/// Seek to the previous subtitle boundary.
 struct video_frame_prev_boundary : public validator_video_loaded {
 	CMD_NAME("video/frame/prev/boundary")
 	STR_MENU("Previous Boundary")
@@ -443,7 +418,6 @@ struct video_frame_prev_boundary : public validator_video_loaded {
 	}
 };
 
-/// Seek to the previous keyframe.
 struct video_frame_prev_keyframe : public validator_video_loaded {
 	CMD_NAME("video/frame/prev/keyframe")
 	STR_MENU("Previous Keyframe")
@@ -466,7 +440,6 @@ struct video_frame_prev_keyframe : public validator_video_loaded {
 	}
 };
 
-/// Fast jump backwards
 struct video_frame_prev_large : public validator_video_loaded {
 	CMD_NAME("video/frame/prev/large")
 	STR_MENU("Fast jump backwards")
@@ -518,7 +491,6 @@ static void save_snapshot(agi::Context *c, bool raw) {
 	GetImage(*c->videoController->GetFrame(c->videoController->GetFrameN(), raw)).SaveFile(to_wx(path), wxBITMAP_TYPE_PNG);
 }
 
-/// Save the current video frame, with subtitles (if any)
 struct video_frame_save : public validator_video_loaded {
 	CMD_NAME("video/frame/save")
 	STR_MENU("Save PNG snapshot")
@@ -530,7 +502,6 @@ struct video_frame_save : public validator_video_loaded {
 	}
 };
 
-/// Save the current video frame, without subtitles
 struct video_frame_save_raw : public validator_video_loaded {
 	CMD_NAME("video/frame/save/raw")
 	STR_MENU("Save PNG snapshot (no subtitles)")
@@ -542,7 +513,6 @@ struct video_frame_save_raw : public validator_video_loaded {
 	}
 };
 
-/// Jump to frame or time.
 struct video_jump : public validator_video_loaded {
 	CMD_NAME("video/jump")
 	STR_MENU("&Jump to...")
@@ -558,7 +528,6 @@ struct video_jump : public validator_video_loaded {
 	}
 };
 
-/// Jumps the video to the end frame of current subtitle.
 struct video_jump_end : public validator_video_loaded {
 	CMD_NAME("video/jump/end")
 	STR_MENU("Jump Video to &End")
@@ -572,7 +541,6 @@ struct video_jump_end : public validator_video_loaded {
 	}
 };
 
-/// Jumps the video to the start frame of current subtitle.
 struct video_jump_start : public validator_video_loaded {
 	CMD_NAME("video/jump/start")
 	STR_MENU("Jump Video to &Start")
@@ -585,7 +553,6 @@ struct video_jump_start : public validator_video_loaded {
 	}
 };
 
-/// Opens a video file.
 struct video_open : public Command {
 	CMD_NAME("video/open")
 	STR_MENU("&Open Video...")
@@ -601,7 +568,6 @@ struct video_open : public Command {
 	}
 };
 
-/// Opens a video clip with solid colour.
 struct video_open_dummy : public Command {
 	CMD_NAME("video/open/dummy")
 	STR_MENU("&Use Dummy Video...")
@@ -615,7 +581,6 @@ struct video_open_dummy : public Command {
 	}
 };
 
-/// Toggle autoscrolling video when the active line changes
 struct video_opt_autoscroll : public Command {
 	CMD_NAME("video/opt/autoscroll")
 	STR_MENU("Toggle autoscroll of video")
@@ -632,7 +597,6 @@ struct video_opt_autoscroll : public Command {
 	}
 };
 
-/// Play video.
 struct video_play : public validator_video_loaded {
 	CMD_NAME("video/play")
 	STR_MENU("Play")
@@ -644,7 +608,6 @@ struct video_play : public validator_video_loaded {
 	}
 };
 
-/// Play video for the active line.
 struct video_play_line : public validator_video_loaded {
 	CMD_NAME("video/play/line")
 	STR_MENU("Play line")
@@ -656,7 +619,6 @@ struct video_play_line : public validator_video_loaded {
 	}
 };
 
-/// Show a mask over the video.
 struct video_show_overscan : public validator_video_loaded {
 	CMD_NAME("video/show_overscan")
 	STR_MENU("Show &Overscan Mask")
@@ -674,7 +636,6 @@ struct video_show_overscan : public validator_video_loaded {
 	}
 };
 
-/// Set zoom to 100%.
 class video_zoom_100: public validator_video_attached {
 public:
 	CMD_NAME("video/zoom/100")
@@ -693,7 +654,6 @@ public:
 	}
 };
 
-/// Stop video playback
 class video_stop: public validator_video_loaded {
 public:
 	CMD_NAME("video/stop")
@@ -706,7 +666,6 @@ public:
 	}
 };
 
-/// Set zoom to 200%.
 class video_zoom_200: public validator_video_attached {
 public:
 	CMD_NAME("video/zoom/200")
@@ -725,7 +684,6 @@ public:
 	}
 };
 
-/// Set zoom to 50%.
 class video_zoom_50: public validator_video_attached {
 public:
 	CMD_NAME("video/zoom/50")
@@ -744,7 +702,6 @@ public:
 	}
 };
 
-/// Zoom video in.
 struct video_zoom_in : public validator_video_attached {
 	CMD_NAME("video/zoom/in")
 	STR_MENU("Zoom In")
@@ -756,7 +713,6 @@ struct video_zoom_in : public validator_video_attached {
 	}
 };
 
-/// Zoom video out.
 struct video_zoom_out : public validator_video_attached {
 	CMD_NAME("video/zoom/out")
 	STR_MENU("Zoom Out")
@@ -769,8 +725,6 @@ struct video_zoom_out : public validator_video_attached {
 };
 }
 
-/// @}
-
 namespace cmd {
 	void init_video() {
 		reg(agi::util::make_unique<video_aspect_cinematic>());
diff --git a/aegisub/src/command/vis_tool.cpp b/aegisub/src/command/vis_tool.cpp
index 89047a36b..9c331b39f 100644
--- a/aegisub/src/command/vis_tool.cpp
+++ b/aegisub/src/command/vis_tool.cpp
@@ -14,11 +14,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file vis_tool.cpp
-/// @brief Visual typesetting tools commands
-/// @ingroup command visual_ui
-///
-
 #include "../config.h"
 
 #include "command.h"
@@ -39,8 +34,6 @@
 
 namespace {
 	using cmd::Command;
-	/// @defgroup cmd-visual Visual typesetting tools commands
-	/// @{
 
 	template<class T>
 	struct visual_tool_command : public Command {
@@ -109,8 +102,6 @@ namespace {
 	};
 }
 
-/// @}
-
 namespace cmd {
 	void init_visual_tools() {
 		reg(agi::util::make_unique<visual_mode_cross>());