content: remove explicit {content,extra}Dependencies

277 files changed, 1 insertions, 1492 deletions

diff --git a/src/content/dependencies/generateAbsoluteDatetimestamp.js b/src/content/dependencies/generateAbsoluteDatetimestamp.js
index 930b6f13..2250ded3 100644
--- a/src/content/dependencies/generateAbsoluteDatetimestamp.js
+++ b/src/content/dependencies/generateAbsoluteDatetimestamp.js
@@ -1,11 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateDatetimestampTemplate',
-    'generateTooltip',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   data: (date) =>
     ({date}),
 
diff --git a/src/content/dependencies/generateAdditionalFilesList.js b/src/content/dependencies/generateAdditionalFilesList.js
index 7e05b5b5..699c5f86 100644
--- a/src/content/dependencies/generateAdditionalFilesList.js
+++ b/src/content/dependencies/generateAdditionalFilesList.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateAdditionalFilesListChunk'],
-  extraDependencies: ['html'],
-
   relations: (relation, additionalFiles) => ({
     chunks:
       additionalFiles
diff --git a/src/content/dependencies/generateAdditionalFilesListChunk.js b/src/content/dependencies/generateAdditionalFilesListChunk.js
index 3cac851b..466a5d8d 100644
--- a/src/content/dependencies/generateAdditionalFilesListChunk.js
+++ b/src/content/dependencies/generateAdditionalFilesListChunk.js
@@ -1,9 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['linkAdditionalFile', 'transformContent'],
-  extraDependencies: ['getSizeOfMediaFile', 'html', 'language', 'urls'],
-
   relations: (relation, file) => ({
     description:
       relation('transformContent', file.description),
diff --git a/src/content/dependencies/generateAdditionalNamesBox.js b/src/content/dependencies/generateAdditionalNamesBox.js
index 8bb61528..6bd1ab42 100644
--- a/src/content/dependencies/generateAdditionalNamesBox.js
+++ b/src/content/dependencies/generateAdditionalNamesBox.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateAdditionalNamesBoxItem'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, additionalNames) => ({
     items:
       additionalNames
diff --git a/src/content/dependencies/generateAdditionalNamesBoxItem.js b/src/content/dependencies/generateAdditionalNamesBoxItem.js
index e3e59a34..a39711c1 100644
--- a/src/content/dependencies/generateAdditionalNamesBoxItem.js
+++ b/src/content/dependencies/generateAdditionalNamesBoxItem.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['transformContent'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, entry) => ({
     nameContent:
       relation('transformContent', entry.name),
diff --git a/src/content/dependencies/generateAlbumArtInfoBox.js b/src/content/dependencies/generateAlbumArtInfoBox.js
index 8c44c930..5491192a 100644
--- a/src/content/dependencies/generateAlbumArtInfoBox.js
+++ b/src/content/dependencies/generateAlbumArtInfoBox.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateReleaseInfoContributionsLine'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, album) => ({
     wallpaperArtistContributionsLine:
       (album.wallpaperArtwork
diff --git a/src/content/dependencies/generateAlbumArtworkColumn.js b/src/content/dependencies/generateAlbumArtworkColumn.js
index 150d3b6e..5346e56b 100644
--- a/src/content/dependencies/generateAlbumArtworkColumn.js
+++ b/src/content/dependencies/generateAlbumArtworkColumn.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateAlbumArtInfoBox', 'generateCoverArtwork'],
-  extraDependencies: ['html'],
-
   query: (album) => ({
     nonAttachingArtworkIndex:
       (album.hasCoverArt
diff --git a/src/content/dependencies/generateAlbumBanner.js b/src/content/dependencies/generateAlbumBanner.js
index 3cc141bc..dce258de 100644
--- a/src/content/dependencies/generateAlbumBanner.js
+++ b/src/content/dependencies/generateAlbumBanner.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateBanner'],
-  extraDependencies: ['html', 'language'],
-
   relations(relation, album) {
     if (!album.hasBannerArt) {
       return {};
diff --git a/src/content/dependencies/generateAlbumCommentaryPage.js b/src/content/dependencies/generateAlbumCommentaryPage.js
index 3529c4dc..4c203877 100644
--- a/src/content/dependencies/generateAlbumCommentaryPage.js
+++ b/src/content/dependencies/generateAlbumCommentaryPage.js
@@ -1,22 +1,6 @@
 import {empty, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateAlbumCommentarySidebar',
-    'generateAlbumNavAccent',
-    'generateAlbumSecondaryNav',
-    'generateAlbumStyleTags',
-    'generateCommentaryEntry',
-    'generateContentHeading',
-    'generateCoverArtwork',
-    'generatePageLayout',
-    'linkAlbum',
-    'linkExternal',
-    'linkTrack',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query(album) {
     const query = {};
 
diff --git a/src/content/dependencies/generateAlbumCommentarySidebar.js b/src/content/dependencies/generateAlbumCommentarySidebar.js
index 9ecec66d..4863f059 100644
--- a/src/content/dependencies/generateAlbumCommentarySidebar.js
+++ b/src/content/dependencies/generateAlbumCommentarySidebar.js
@@ -1,15 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateAlbumSidebarTrackSection',
-    'generatePageSidebar',
-    'generatePageSidebarBox',
-    'linkAlbum',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, album) => ({
     sidebar:
       relation('generatePageSidebar'),
diff --git a/src/content/dependencies/generateAlbumGalleryAlbumGrid.js b/src/content/dependencies/generateAlbumGalleryAlbumGrid.js
index 7f152871..f9cd027e 100644
--- a/src/content/dependencies/generateAlbumGalleryAlbumGrid.js
+++ b/src/content/dependencies/generateAlbumGalleryAlbumGrid.js
@@ -1,14 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateCoverGrid',
-    'image',
-    'linkAlbum',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (album) => ({
     artworks:
       (album.hasCoverArt
diff --git a/src/content/dependencies/generateAlbumGalleryCoverArtistsLine.js b/src/content/dependencies/generateAlbumGalleryCoverArtistsLine.js
index 7dcdf6de..0322e227 100644
--- a/src/content/dependencies/generateAlbumGalleryCoverArtistsLine.js
+++ b/src/content/dependencies/generateAlbumGalleryCoverArtistsLine.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkArtistGallery'],
-  extraDependencies: ['html', 'language'],
-
   relations(relation, coverArtists) {
     return {
       coverArtistLinks:
diff --git a/src/content/dependencies/generateAlbumGalleryNoTrackArtworksLine.js b/src/content/dependencies/generateAlbumGalleryNoTrackArtworksLine.js
index ad99cb87..5932514e 100644
--- a/src/content/dependencies/generateAlbumGalleryNoTrackArtworksLine.js
+++ b/src/content/dependencies/generateAlbumGalleryNoTrackArtworksLine.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html', 'language'],
-
   generate: ({html, language}) =>
     html.tag('p', {class: 'quick-info'},
       language.$('albumGalleryPage.noTrackArtworksLine')),
diff --git a/src/content/dependencies/generateAlbumGalleryPage.js b/src/content/dependencies/generateAlbumGalleryPage.js
index 516a7ca8..85b0fb74 100644
--- a/src/content/dependencies/generateAlbumGalleryPage.js
+++ b/src/content/dependencies/generateAlbumGalleryPage.js
@@ -2,21 +2,6 @@ import {stitchArrays, unique} from '#sugar';
 import {getKebabCase} from '#wiki-data';
 
 export default {
-  contentDependencies: [
-    'generateAlbumGalleryAlbumGrid',
-    'generateAlbumGalleryNoTrackArtworksLine',
-    'generateAlbumGalleryStatsLine',
-    'generateAlbumGalleryTrackGrid',
-    'generateAlbumNavAccent',
-    'generateAlbumSecondaryNav',
-    'generateAlbumStyleTags',
-    'generateIntrapageDotSwitcher',
-    'generatePageLayout',
-    'linkAlbum',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query(album) {
     const query = {};
 
diff --git a/src/content/dependencies/generateAlbumGalleryStatsLine.js b/src/content/dependencies/generateAlbumGalleryStatsLine.js
index 09d9a30b..75341937 100644
--- a/src/content/dependencies/generateAlbumGalleryStatsLine.js
+++ b/src/content/dependencies/generateAlbumGalleryStatsLine.js
@@ -1,8 +1,6 @@
 import {getTotalDuration} from '#wiki-data';
 
 export default {
-  extraDependencies: ['html', 'language'],
-
   data: (album) => ({
     date:
       album.date,
diff --git a/src/content/dependencies/generateAlbumGalleryTrackGrid.js b/src/content/dependencies/generateAlbumGalleryTrackGrid.js
index 86c35b6f..a50448c6 100644
--- a/src/content/dependencies/generateAlbumGalleryTrackGrid.js
+++ b/src/content/dependencies/generateAlbumGalleryTrackGrid.js
@@ -1,16 +1,6 @@
 import {compareArrays, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateAlbumGalleryCoverArtistsLine',
-    'generateCoverGrid',
-    'image',
-    'linkAlbum',
-    'linkTrack',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query(album, label) {
     const query = {};
 
diff --git a/src/content/dependencies/generateAlbumInfoPage.js b/src/content/dependencies/generateAlbumInfoPage.js
index 8f8b921c..a27074ff 100644
--- a/src/content/dependencies/generateAlbumInfoPage.js
+++ b/src/content/dependencies/generateAlbumInfoPage.js
@@ -1,30 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateAdditionalFilesList',
-    'generateAdditionalNamesBox',
-    'generateAlbumArtworkColumn',
-    'generateAlbumBanner',
-    'generateAlbumNavAccent',
-    'generateAlbumReleaseInfo',
-    'generateAlbumSecondaryNav',
-    'generateAlbumSidebar',
-    'generateAlbumSocialEmbed',
-    'generateAlbumStyleTags',
-    'generateAlbumTrackList',
-    'generateCollapsedContentEntrySection',
-    'generateCommentaryContentHeading',
-    'generateCommentaryEntry',
-    'generateContentHeading',
-    'generatePageLayout',
-    'generateReadCommentaryLine',
-    'linkAlbumCommentary',
-    'linkAlbumGallery',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, album) => ({
     layout:
       relation('generatePageLayout'),
diff --git a/src/content/dependencies/generateAlbumNavAccent.js b/src/content/dependencies/generateAlbumNavAccent.js
index 00aec94a..237120f3 100644
--- a/src/content/dependencies/generateAlbumNavAccent.js
+++ b/src/content/dependencies/generateAlbumNavAccent.js
@@ -1,17 +1,6 @@
 import {atOffset, empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateInterpageDotSwitcher',
-    'generateNextLink',
-    'generatePreviousLink',
-    'linkTrack',
-    'linkAlbumCommentary',
-    'linkAlbumGallery',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query(album, track) {
     const query = {};
 
diff --git a/src/content/dependencies/generateAlbumReferencedArtworksPage.js b/src/content/dependencies/generateAlbumReferencedArtworksPage.js
index 52c78dc2..e4022f0d 100644
--- a/src/content/dependencies/generateAlbumReferencedArtworksPage.js
+++ b/src/content/dependencies/generateAlbumReferencedArtworksPage.js
@@ -1,13 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateAlbumStyleTags',
-    'generateBackToAlbumLink',
-    'generateReferencedArtworksPage',
-    'linkAlbum',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, album) => ({
     page:
       relation('generateReferencedArtworksPage', album.coverArtworks[0]),
diff --git a/src/content/dependencies/generateAlbumReferencingArtworksPage.js b/src/content/dependencies/generateAlbumReferencingArtworksPage.js
index bc36ae06..0dc1bf15 100644
--- a/src/content/dependencies/generateAlbumReferencingArtworksPage.js
+++ b/src/content/dependencies/generateAlbumReferencingArtworksPage.js
@@ -1,13 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateAlbumStyleTags',
-    'generateBackToAlbumLink',
-    'generateReferencingArtworksPage',
-    'linkAlbum',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, album) => ({
     page:
       relation('generateReferencingArtworksPage', album.coverArtworks[0]),
diff --git a/src/content/dependencies/generateAlbumReleaseInfo.js b/src/content/dependencies/generateAlbumReleaseInfo.js
index a156dfec..4cec4120 100644
--- a/src/content/dependencies/generateAlbumReleaseInfo.js
+++ b/src/content/dependencies/generateAlbumReleaseInfo.js
@@ -1,13 +1,6 @@
 import {accumulateSum, empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateReleaseInfoContributionsLine',
-    'generateReleaseInfoListenLine',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations(relation, album) {
     const relations = {};
 
diff --git a/src/content/dependencies/generateAlbumSecondaryNav.js b/src/content/dependencies/generateAlbumSecondaryNav.js
index bfa48f03..2140bfdb 100644
--- a/src/content/dependencies/generateAlbumSecondaryNav.js
+++ b/src/content/dependencies/generateAlbumSecondaryNav.js
@@ -1,15 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateAlbumSecondaryNavGroupPart',
-    'generateAlbumSecondaryNavSeriesPart',
-    'generateDotSwitcherTemplate',
-    'generateSecondaryNav',
-  ],
-
-  extraDependencies: ['html', 'wikiData'],
-
   sprawl: ({groupData}) => ({
     // TODO: Series aren't their own things, so we access them weirdly.
     seriesData:
diff --git a/src/content/dependencies/generateAlbumSecondaryNavGroupPart.js b/src/content/dependencies/generateAlbumSecondaryNavGroupPart.js
index 22dfa51c..2f08804b 100644
--- a/src/content/dependencies/generateAlbumSecondaryNavGroupPart.js
+++ b/src/content/dependencies/generateAlbumSecondaryNavGroupPart.js
@@ -2,15 +2,6 @@ import {sortChronologically} from '#sort';
 import {atOffset} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generateSecondaryNavParentSiblingsPart',
-    'linkAlbumDynamically',
-    'linkGroup',
-  ],
-
-  extraDependencies: ['html'],
-
   query(group, album) {
     const query = {};
 
diff --git a/src/content/dependencies/generateAlbumSecondaryNavSeriesPart.js b/src/content/dependencies/generateAlbumSecondaryNavSeriesPart.js
index 16f205e3..ee180f16 100644
--- a/src/content/dependencies/generateAlbumSecondaryNavSeriesPart.js
+++ b/src/content/dependencies/generateAlbumSecondaryNavSeriesPart.js
@@ -1,15 +1,6 @@
 import {atOffset} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generateSecondaryNavParentSiblingsPart',
-    'linkAlbumDynamically',
-    'linkGroup',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query(series, album) {
     const query = {};
 
diff --git a/src/content/dependencies/generateAlbumSidebar.js b/src/content/dependencies/generateAlbumSidebar.js
index a8190521..83a637b0 100644
--- a/src/content/dependencies/generateAlbumSidebar.js
+++ b/src/content/dependencies/generateAlbumSidebar.js
@@ -2,17 +2,6 @@ import {sortAlbumsTracksChronologically} from '#sort';
 import {stitchArrays, transposeArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateAlbumSidebarGroupBox',
-    'generateAlbumSidebarSeriesBox',
-    'generateAlbumSidebarTrackListBox',
-    'generatePageSidebar',
-    'generatePageSidebarConjoinedBox',
-    'generateTrackReleaseBox',
-  ],
-
-  extraDependencies: ['html', 'wikiData'],
-
   sprawl: ({groupData}) => ({
     // TODO: Series aren't their own things, so we access them weirdly.
     seriesData:
diff --git a/src/content/dependencies/generateAlbumSidebarGroupBox.js b/src/content/dependencies/generateAlbumSidebarGroupBox.js
index f3be74f7..0a9c0db9 100644
--- a/src/content/dependencies/generateAlbumSidebarGroupBox.js
+++ b/src/content/dependencies/generateAlbumSidebarGroupBox.js
@@ -2,16 +2,6 @@ import {sortChronologically} from '#sort';
 import {atOffset} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generatePageSidebarBox',
-    'linkAlbum',
-    'linkExternal',
-    'linkGroup',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query(album, group) {
     const query = {};
 
diff --git a/src/content/dependencies/generateAlbumSidebarSeriesBox.js b/src/content/dependencies/generateAlbumSidebarSeriesBox.js
index 37616cb2..22f1fe72 100644
--- a/src/content/dependencies/generateAlbumSidebarSeriesBox.js
+++ b/src/content/dependencies/generateAlbumSidebarSeriesBox.js
@@ -1,15 +1,6 @@
 import {atOffset} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generatePageSidebarBox',
-    'linkAlbum',
-    'linkGroup',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query(album, series) {
     const query = {};
 
diff --git a/src/content/dependencies/generateAlbumSidebarTrackListBox.js b/src/content/dependencies/generateAlbumSidebarTrackListBox.js
index 218e07ab..4e9437c9 100644
--- a/src/content/dependencies/generateAlbumSidebarTrackListBox.js
+++ b/src/content/dependencies/generateAlbumSidebarTrackListBox.js
@@ -1,12 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateAlbumSidebarTrackSection',
-    'generatePageSidebarBox',
-    'linkAlbum',
-  ],
-
-  extraDependencies: ['html'],
-
   relations: (relation, album, track) => ({
     box:
       relation('generatePageSidebarBox'),
diff --git a/src/content/dependencies/generateAlbumSidebarTrackSection.js b/src/content/dependencies/generateAlbumSidebarTrackSection.js
index a158d2d4..68281bfe 100644
--- a/src/content/dependencies/generateAlbumSidebarTrackSection.js
+++ b/src/content/dependencies/generateAlbumSidebarTrackSection.js
@@ -1,9 +1,6 @@
 import {empty, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['linkTrack'],
-  extraDependencies: ['getColors', 'html', 'language'],
-
   relations(relation, album, track, trackSection) {
     const relations = {};
 
diff --git a/src/content/dependencies/generateAlbumSocialEmbed.js b/src/content/dependencies/generateAlbumSocialEmbed.js
index e28a3fd0..1200ec8b 100644
--- a/src/content/dependencies/generateAlbumSocialEmbed.js
+++ b/src/content/dependencies/generateAlbumSocialEmbed.js
@@ -1,13 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateSocialEmbed',
-    'generateAlbumSocialEmbedDescription',
-  ],
-
-  extraDependencies: ['absoluteTo', 'language'],
-
   relations(relation, album) {
     return {
       socialEmbed:
diff --git a/src/content/dependencies/generateAlbumSocialEmbedDescription.js b/src/content/dependencies/generateAlbumSocialEmbedDescription.js
index 69c39c3a..db6da5b7 100644
--- a/src/content/dependencies/generateAlbumSocialEmbedDescription.js
+++ b/src/content/dependencies/generateAlbumSocialEmbedDescription.js
@@ -1,8 +1,6 @@
 import {accumulateSum} from '#sugar';
 
 export default {
-  extraDependencies: ['language'],
-
   data: (album) => ({
     duration:
       accumulateSum(album.tracks, track => track.duration),
diff --git a/src/content/dependencies/generateAlbumStyleTags.js b/src/content/dependencies/generateAlbumStyleTags.js
index 4cdc6581..caf21dc4 100644
--- a/src/content/dependencies/generateAlbumStyleTags.js
+++ b/src/content/dependencies/generateAlbumStyleTags.js
@@ -1,9 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: ['generateAlbumWallpaperStyleTag', 'generateStyleTag'],
-  extraDependencies: ['html'],
-
   relations: (relation, album, _track) => ({
     styleTag:
       relation('generateStyleTag'),
diff --git a/src/content/dependencies/generateAlbumTrackList.js b/src/content/dependencies/generateAlbumTrackList.js
index 0a949ded..93cb420b 100644
--- a/src/content/dependencies/generateAlbumTrackList.js
+++ b/src/content/dependencies/generateAlbumTrackList.js
@@ -35,14 +35,6 @@ function getDisplayMode(album) {
 }
 
 export default {
-  contentDependencies: [
-    'generateAlbumTrackListItem',
-    'generateContentHeading',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query(album) {
     return {
       displayMode: getDisplayMode(album),
diff --git a/src/content/dependencies/generateAlbumTrackListItem.js b/src/content/dependencies/generateAlbumTrackListItem.js
index 201ca53a..ab8d477d 100644
--- a/src/content/dependencies/generateAlbumTrackListItem.js
+++ b/src/content/dependencies/generateAlbumTrackListItem.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateTrackListItem'],
-  extraDependencies: ['html'],
-
   query: (track, album) => ({
     trackHasDuration:
       !!track.duration,
diff --git a/src/content/dependencies/generateAlbumWallpaperStyleTag.js b/src/content/dependencies/generateAlbumWallpaperStyleTag.js
index 47864a1d..b3f74716 100644
--- a/src/content/dependencies/generateAlbumWallpaperStyleTag.js
+++ b/src/content/dependencies/generateAlbumWallpaperStyleTag.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateWallpaperStyleTag'],
-  extraDependencies: ['html'],
-
   relations: (relation, album) => ({
     wallpaperStyleTag:
       (album.hasWallpaperArt
diff --git a/src/content/dependencies/generateArtTagAncestorDescendantMapList.js b/src/content/dependencies/generateArtTagAncestorDescendantMapList.js
index 80d19b5a..37a32a94 100644
--- a/src/content/dependencies/generateArtTagAncestorDescendantMapList.js
+++ b/src/content/dependencies/generateArtTagAncestorDescendantMapList.js
@@ -6,9 +6,6 @@ import {
 } from '#sugar';
 
 export default {
-  contentDependencies: ['linkArtTagDynamically'],
-  extraDependencies: ['html', 'language'],
-
   // Recursion ain't too pretty!
 
   query(ancestorArtTag, targetArtTag) {
diff --git a/src/content/dependencies/generateArtTagGalleryPage.js b/src/content/dependencies/generateArtTagGalleryPage.js
index cfd6d03e..f20babba 100644
--- a/src/content/dependencies/generateArtTagGalleryPage.js
+++ b/src/content/dependencies/generateArtTagGalleryPage.js
@@ -2,22 +2,6 @@ import {sortArtworksChronologically} from '#sort';
 import {empty, stitchArrays, unique} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateAdditionalNamesBox',
-    'generateArtTagGalleryPageFeaturedLine',
-    'generateArtTagGalleryPageShowingLine',
-    'generateArtTagNavLinks',
-    'generateCoverGrid',
-    'generatePageLayout',
-    'generateQuickDescription',
-    'image',
-    'linkAnythingMan',
-    'linkArtTagGallery',
-    'linkExternal',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl({wikiInfo}) {
     return {
       enableListings: wikiInfo.enableListings,
diff --git a/src/content/dependencies/generateArtTagGalleryPageFeaturedLine.js b/src/content/dependencies/generateArtTagGalleryPageFeaturedLine.js
index b4620fa4..8593cc21 100644
--- a/src/content/dependencies/generateArtTagGalleryPageFeaturedLine.js
+++ b/src/content/dependencies/generateArtTagGalleryPageFeaturedLine.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html', 'language'],
-
   slots: {
     showing: {
       validate: v => v.is('all', 'direct', 'indirect'),
diff --git a/src/content/dependencies/generateArtTagGalleryPageShowingLine.js b/src/content/dependencies/generateArtTagGalleryPageShowingLine.js
index 6df4d0e5..2a34ae57 100644
--- a/src/content/dependencies/generateArtTagGalleryPageShowingLine.js
+++ b/src/content/dependencies/generateArtTagGalleryPageShowingLine.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html', 'language'],
-
   slots: {
     showing: {
       validate: v => v.is('all', 'direct', 'indirect'),
diff --git a/src/content/dependencies/generateArtTagInfoPage.js b/src/content/dependencies/generateArtTagInfoPage.js
index 7a17ee11..683eeab6 100644
--- a/src/content/dependencies/generateArtTagInfoPage.js
+++ b/src/content/dependencies/generateArtTagInfoPage.js
@@ -1,20 +1,6 @@
 import {empty, stitchArrays, unique} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateAdditionalNamesBox',
-    'generateArtTagNavLinks',
-    'generateArtTagSidebar',
-    'generateContentHeading',
-    'generatePageLayout',
-    'linkArtTagGallery',
-    'linkArtTagInfo',
-    'linkExternal',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({wikiInfo}) => ({
     enableListings: wikiInfo.enableListings,
   }),
diff --git a/src/content/dependencies/generateArtTagNavLinks.js b/src/content/dependencies/generateArtTagNavLinks.js
index 9061a09f..1298ce99 100644
--- a/src/content/dependencies/generateArtTagNavLinks.js
+++ b/src/content/dependencies/generateArtTagNavLinks.js
@@ -1,12 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateInterpageDotSwitcher',
-    'linkArtTagInfo',
-    'linkArtTagGallery',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({wikiInfo}) =>
     ({enableListings: wikiInfo.enableListings}),
 
diff --git a/src/content/dependencies/generateArtTagSidebar.js b/src/content/dependencies/generateArtTagSidebar.js
index 9e2f813c..60ea504f 100644
--- a/src/content/dependencies/generateArtTagSidebar.js
+++ b/src/content/dependencies/generateArtTagSidebar.js
@@ -1,15 +1,6 @@
 import {collectTreeLeaves, empty, stitchArrays, unique} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generatePageSidebar',
-    'generatePageSidebarBox',
-    'generateArtTagAncestorDescendantMapList',
-    'linkArtTagDynamically',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({artTagData}) =>
     ({artTagData}),
 
diff --git a/src/content/dependencies/generateArtistArtworkColumn.js b/src/content/dependencies/generateArtistArtworkColumn.js
index a4135489..19c66b8a 100644
--- a/src/content/dependencies/generateArtistArtworkColumn.js
+++ b/src/content/dependencies/generateArtistArtworkColumn.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['generateCoverArtwork'],
-
   relations: (relation, artist) => ({
     coverArtwork:
       (artist.hasAvatar
diff --git a/src/content/dependencies/generateArtistCredit.js b/src/content/dependencies/generateArtistCredit.js
index 6bf66e92..389de740 100644
--- a/src/content/dependencies/generateArtistCredit.js
+++ b/src/content/dependencies/generateArtistCredit.js
@@ -1,14 +1,6 @@
 import {compareArrays, empty, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateArtistCreditWikiEditsPart',
-    'linkContribution',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (creditContributions, contextContributions, _formatText) => {
     const query = {};
 
diff --git a/src/content/dependencies/generateArtistCreditWikiEditsPart.js b/src/content/dependencies/generateArtistCreditWikiEditsPart.js
index 1b9930ee..4178928d 100644
--- a/src/content/dependencies/generateArtistCreditWikiEditsPart.js
+++ b/src/content/dependencies/generateArtistCreditWikiEditsPart.js
@@ -1,12 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateTextWithTooltip',
-    'generateTooltip',
-    'linkContribution',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, contributions) => ({
     textWithTooltip:
       relation('generateTextWithTooltip'),
diff --git a/src/content/dependencies/generateArtistGalleryPage.js b/src/content/dependencies/generateArtistGalleryPage.js
index 094edc0c..d8f1c4b1 100644
--- a/src/content/dependencies/generateArtistGalleryPage.js
+++ b/src/content/dependencies/generateArtistGalleryPage.js
@@ -1,16 +1,6 @@
 import {sortArtworksChronologically} from '#sort';
 
 export default {
-  contentDependencies: [
-    'generateArtistNavLinks',
-    'generateCoverGrid',
-    'generatePageLayout',
-    'image',
-    'linkAnythingMan',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (artist) => ({
     artworks:
       sortArtworksChronologically(
diff --git a/src/content/dependencies/generateArtistGroupContributionsInfo.js b/src/content/dependencies/generateArtistGroupContributionsInfo.js
index e1fa7a0b..6940053f 100644
--- a/src/content/dependencies/generateArtistGroupContributionsInfo.js
+++ b/src/content/dependencies/generateArtistGroupContributionsInfo.js
@@ -1,9 +1,6 @@
 import {accumulateSum, empty, stitchArrays, withEntries} from '#sugar';
 
 export default {
-  contentDependencies: ['linkGroup'],
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({groupCategoryData}) => ({
     groupOrder:
       groupCategoryData.flatMap(category => category.groups),
diff --git a/src/content/dependencies/generateArtistInfoPage.js b/src/content/dependencies/generateArtistInfoPage.js
index 1f738de4..cf8ce994 100644
--- a/src/content/dependencies/generateArtistInfoPage.js
+++ b/src/content/dependencies/generateArtistInfoPage.js
@@ -1,24 +1,6 @@
 import {empty, stitchArrays, unique} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateArtistArtworkColumn',
-    'generateArtistGroupContributionsInfo',
-    'generateArtistInfoPageArtworksChunkedList',
-    'generateArtistInfoPageCommentaryChunkedList',
-    'generateArtistInfoPageFlashesChunkedList',
-    'generateArtistInfoPageTracksChunkedList',
-    'generateArtistNavLinks',
-    'generateContentHeading',
-    'generatePageLayout',
-    'linkArtistGallery',
-    'linkExternal',
-    'linkGroup',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (artist) => ({
     trackContributions: [
       ...artist.trackArtistContributions,
diff --git a/src/content/dependencies/generateArtistInfoPageArtworksChunk.js b/src/content/dependencies/generateArtistInfoPageArtworksChunk.js
index 66e4204a..f4c9439a 100644
--- a/src/content/dependencies/generateArtistInfoPageArtworksChunk.js
+++ b/src/content/dependencies/generateArtistInfoPageArtworksChunk.js
@@ -1,12 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateArtistInfoPageChunk',
-    'generateArtistInfoPageArtworksChunkItem',
-    'linkAlbum',
-  ],
-
-  extraDependencies: ['html'],
-
   relations: (relation, album, contribs) => ({
     template:
       relation('generateArtistInfoPageChunk'),
diff --git a/src/content/dependencies/generateArtistInfoPageArtworksChunkItem.js b/src/content/dependencies/generateArtistInfoPageArtworksChunkItem.js
index 98d9ce7a..8259e91e 100644
--- a/src/content/dependencies/generateArtistInfoPageArtworksChunkItem.js
+++ b/src/content/dependencies/generateArtistInfoPageArtworksChunkItem.js
@@ -1,15 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateArtistInfoPageChunkItem',
-    'generateArtistInfoPageOtherArtistLinks',
-    'linkTrack',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (contrib) => ({
     kind:
       (contrib.thingProperty === 'bannerArtistContribs' ||
diff --git a/src/content/dependencies/generateArtistInfoPageArtworksChunkedList.js b/src/content/dependencies/generateArtistInfoPageArtworksChunkedList.js
index 75a4aa5a..40ffc5dd 100644
--- a/src/content/dependencies/generateArtistInfoPageArtworksChunkedList.js
+++ b/src/content/dependencies/generateArtistInfoPageArtworksChunkedList.js
@@ -3,11 +3,6 @@ import {sortAlbumsTracksChronologically, sortContributionsChronologically}
 import {chunkByConditions, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateArtistInfoPageChunkedList',
-    'generateArtistInfoPageArtworksChunk',
-  ],
-
   query(artist, filterEditsForWiki) {
     const query = {};
 
diff --git a/src/content/dependencies/generateArtistInfoPageChunk.js b/src/content/dependencies/generateArtistInfoPageChunk.js
index fce68a7d..80429912 100644
--- a/src/content/dependencies/generateArtistInfoPageChunk.js
+++ b/src/content/dependencies/generateArtistInfoPageChunk.js
@@ -1,8 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  extraDependencies: ['html', 'language'],
-
   slots: {
     mode: {
       validate: v => v.is('flash', 'album'),
diff --git a/src/content/dependencies/generateArtistInfoPageChunkItem.js b/src/content/dependencies/generateArtistInfoPageChunkItem.js
index c80aeab7..8117ca9a 100644
--- a/src/content/dependencies/generateArtistInfoPageChunkItem.js
+++ b/src/content/dependencies/generateArtistInfoPageChunkItem.js
@@ -1,9 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: ['generateTextWithTooltip'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation) => ({
     textWithTooltip:
       relation('generateTextWithTooltip'),
diff --git a/src/content/dependencies/generateArtistInfoPageChunkedList.js b/src/content/dependencies/generateArtistInfoPageChunkedList.js
index e7915ab7..54577885 100644
--- a/src/content/dependencies/generateArtistInfoPageChunkedList.js
+++ b/src/content/dependencies/generateArtistInfoPageChunkedList.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html'],
-
   slots: {
     groupInfo: {
       type: 'html',
diff --git a/src/content/dependencies/generateArtistInfoPageCommentaryChunkedList.js b/src/content/dependencies/generateArtistInfoPageCommentaryChunkedList.js
index 88c5ed54..caec58d6 100644
--- a/src/content/dependencies/generateArtistInfoPageCommentaryChunkedList.js
+++ b/src/content/dependencies/generateArtistInfoPageCommentaryChunkedList.js
@@ -7,18 +7,6 @@ import {
 } from '#sort';
 
 export default {
-  contentDependencies: [
-    'generateArtistInfoPageChunk',
-    'generateArtistInfoPageChunkItem',
-    'linkAlbum',
-    'linkFlash',
-    'linkFlashAct',
-    'linkTrack',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query(artist, filterWikiEditorCommentary) {
     const processEntry = ({
       thing,
diff --git a/src/content/dependencies/generateArtistInfoPageFirstReleaseTooltip.js b/src/content/dependencies/generateArtistInfoPageFirstReleaseTooltip.js
index 31a223f5..eb32cebf 100644
--- a/src/content/dependencies/generateArtistInfoPageFirstReleaseTooltip.js
+++ b/src/content/dependencies/generateArtistInfoPageFirstReleaseTooltip.js
@@ -2,14 +2,6 @@ import {sortAlbumsTracksChronologically} from '#sort';
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generateTooltip',
-    'linkOtherReleaseOnArtistInfoPage',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (track) => ({
     rereleases:
       sortAlbumsTracksChronologically(track.allReleases).slice(1),
diff --git a/src/content/dependencies/generateArtistInfoPageFlashesChunk.js b/src/content/dependencies/generateArtistInfoPageFlashesChunk.js
index 8aa7223a..acdb9897 100644
--- a/src/content/dependencies/generateArtistInfoPageFlashesChunk.js
+++ b/src/content/dependencies/generateArtistInfoPageFlashesChunk.js
@@ -1,10 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateArtistInfoPageChunk',
-    'generateArtistInfoPageFlashesChunkItem',
-    'linkFlashAct',
-  ],
-
   relations: (relation, flashAct, contribs) => ({
     template:
       relation('generateArtistInfoPageChunk'),
diff --git a/src/content/dependencies/generateArtistInfoPageFlashesChunkItem.js b/src/content/dependencies/generateArtistInfoPageFlashesChunkItem.js
index e4908bf9..36d7945d 100644
--- a/src/content/dependencies/generateArtistInfoPageFlashesChunkItem.js
+++ b/src/content/dependencies/generateArtistInfoPageFlashesChunkItem.js
@@ -1,8 +1,4 @@
 export default {
-  contentDependencies: ['generateArtistInfoPageChunkItem', 'linkFlash'],
-
-  extraDependencies: ['language'],
-
   relations: (relation, contrib) => ({
     // Flashes and games can list multiple contributors as collaborative
     // credits, but we don't display these on the artist page, since they
diff --git a/src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js b/src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js
index b347faf5..762386a2 100644
--- a/src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js
+++ b/src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js
@@ -3,13 +3,6 @@ import {sortContributionsChronologically, sortFlashesChronologically}
 import {chunkByConditions, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateArtistInfoPageChunkedList',
-    'generateArtistInfoPageFlashesChunk',
-  ],
-
-  extraDependencies: ['wikiData'],
-
   sprawl: ({wikiInfo}) => ({
     enableFlashesAndGames:
       wikiInfo.enableFlashesAndGames,
diff --git a/src/content/dependencies/generateArtistInfoPageOtherArtistLinks.js b/src/content/dependencies/generateArtistInfoPageOtherArtistLinks.js
index dcee9c00..afb61c33 100644
--- a/src/content/dependencies/generateArtistInfoPageOtherArtistLinks.js
+++ b/src/content/dependencies/generateArtistInfoPageOtherArtistLinks.js
@@ -1,8 +1,6 @@
 import {unique} from '#sugar';
 
 export default {
-  contentDependencies: ['linkArtist'],
-
   query(contribs) {
     const associatedContributionsByOtherArtists =
       contribs
diff --git a/src/content/dependencies/generateArtistInfoPageRereleaseTooltip.js b/src/content/dependencies/generateArtistInfoPageRereleaseTooltip.js
index 853edcb7..70bada19 100644
--- a/src/content/dependencies/generateArtistInfoPageRereleaseTooltip.js
+++ b/src/content/dependencies/generateArtistInfoPageRereleaseTooltip.js
@@ -1,14 +1,6 @@
 import {sortAlbumsTracksChronologically} from '#sort';
 
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generateTooltip',
-    'linkOtherReleaseOnArtistInfoPage'
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (track) => ({
     firstRelease:
       sortAlbumsTracksChronologically(track.allReleases)[0],
diff --git a/src/content/dependencies/generateArtistInfoPageTracksChunk.js b/src/content/dependencies/generateArtistInfoPageTracksChunk.js
index f6d70901..3e4cc4e9 100644
--- a/src/content/dependencies/generateArtistInfoPageTracksChunk.js
+++ b/src/content/dependencies/generateArtistInfoPageTracksChunk.js
@@ -2,12 +2,6 @@ import {unique} from '#sugar';
 import {getTotalDuration} from '#wiki-data';
 
 export default {
-  contentDependencies: [
-    'generateArtistInfoPageChunk',
-    'generateArtistInfoPageTracksChunkItem',
-    'linkAlbum',
-  ],
-
   relations: (relation, artist, album, trackContribLists) => ({
     template:
       relation('generateArtistInfoPageChunk'),
diff --git a/src/content/dependencies/generateArtistInfoPageTracksChunkItem.js b/src/content/dependencies/generateArtistInfoPageTracksChunkItem.js
index 877b2fe9..895cc0d8 100644
--- a/src/content/dependencies/generateArtistInfoPageTracksChunkItem.js
+++ b/src/content/dependencies/generateArtistInfoPageTracksChunkItem.js
@@ -2,17 +2,7 @@ import {sortAlbumsTracksChronologically} from '#sort';
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateArtistInfoPageChunkItem',
-    'generateArtistInfoPageFirstReleaseTooltip',
-    'generateArtistInfoPageOtherArtistLinks',
-    'generateArtistInfoPageRereleaseTooltip',
-    'linkTrack',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
-  query (_artist, contribs) {
+  query(_artist, contribs) {
     const query = {};
 
     // TODO: Very mysterious what to do if the set of contributions is,
diff --git a/src/content/dependencies/generateArtistInfoPageTracksChunkedList.js b/src/content/dependencies/generateArtistInfoPageTracksChunkedList.js
index 84eb29ac..15588ed3 100644
--- a/src/content/dependencies/generateArtistInfoPageTracksChunkedList.js
+++ b/src/content/dependencies/generateArtistInfoPageTracksChunkedList.js
@@ -4,11 +4,6 @@ import {stitchArrays} from '#sugar';
 import {chunkArtistTrackContributions} from '#wiki-data';
 
 export default {
-  contentDependencies: [
-    'generateArtistInfoPageChunkedList',
-    'generateArtistInfoPageTracksChunk',
-  ],
-
   query(artist) {
     const query = {};
 
diff --git a/src/content/dependencies/generateArtistNavLinks.js b/src/content/dependencies/generateArtistNavLinks.js
index 1a520e84..69ae3e19 100644
--- a/src/content/dependencies/generateArtistNavLinks.js
+++ b/src/content/dependencies/generateArtistNavLinks.js
@@ -1,15 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateInterpageDotSwitcher',
-    'linkArtist',
-    'linkArtistGallery',
-    'linkArtistRollingWindow',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({wikiInfo}) => ({
     enableListings:
       wikiInfo.enableListings,
diff --git a/src/content/dependencies/generateArtistRollingWindowPage.js b/src/content/dependencies/generateArtistRollingWindowPage.js
index 33b1501e..aafd1b55 100644
--- a/src/content/dependencies/generateArtistRollingWindowPage.js
+++ b/src/content/dependencies/generateArtistRollingWindowPage.js
@@ -11,16 +11,6 @@ import {
 } from '#sugar';
 
 export default {
-  contentDependencies: [
-    'image',
-    'generateArtistNavLinks',
-    'generateCoverGrid',
-    'generatePageLayout',
-    'linkAnythingMan',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({groupCategoryData}) => ({
     groupCategoryData,
   }),
diff --git a/src/content/dependencies/generateBackToAlbumLink.js b/src/content/dependencies/generateBackToAlbumLink.js
index 6648b463..08d33348 100644
--- a/src/content/dependencies/generateBackToAlbumLink.js
+++ b/src/content/dependencies/generateBackToAlbumLink.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkAlbum'],
-  extraDependencies: ['language'],
-
   relations: (relation, track) => ({
     trackLink:
       relation('linkAlbum', track),
diff --git a/src/content/dependencies/generateBackToTrackLink.js b/src/content/dependencies/generateBackToTrackLink.js
index 8677d811..90dfb6d5 100644
--- a/src/content/dependencies/generateBackToTrackLink.js
+++ b/src/content/dependencies/generateBackToTrackLink.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkTrack'],
-  extraDependencies: ['language'],
-
   relations: (relation, track) => ({
     trackLink:
       relation('linkTrack', track),
diff --git a/src/content/dependencies/generateBanner.js b/src/content/dependencies/generateBanner.js
index 15eb08eb..509b15c2 100644
--- a/src/content/dependencies/generateBanner.js
+++ b/src/content/dependencies/generateBanner.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html', 'to'],
-
   slots: {
     path: {
       validate: v => v.validateArrayItems(v.isString),
diff --git a/src/content/dependencies/generateCollapsedContentEntrySection.js b/src/content/dependencies/generateCollapsedContentEntrySection.js
index ae3652c7..aec5fe28 100644
--- a/src/content/dependencies/generateCollapsedContentEntrySection.js
+++ b/src/content/dependencies/generateCollapsedContentEntrySection.js
@@ -1,11 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateCommentaryEntry',
-    'generateContentContentHeading',
-  ],
-
-  extraDependencies: ['html'],
-
   relations: (relation, entries, thing) => ({
     contentContentHeading:
       relation('generateContentContentHeading', thing),
diff --git a/src/content/dependencies/generateColorStyleAttribute.js b/src/content/dependencies/generateColorStyleAttribute.js
index 03d95ac5..277ec434 100644
--- a/src/content/dependencies/generateColorStyleAttribute.js
+++ b/src/content/dependencies/generateColorStyleAttribute.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateColorStyleVariables'],
-  extraDependencies: ['html'],
-
   relations: (relation) => ({
     colorVariables:
       relation('generateColorStyleVariables'),
diff --git a/src/content/dependencies/generateColorStyleTag.js b/src/content/dependencies/generateColorStyleTag.js
index 2b1a21dd..b378fd1d 100644
--- a/src/content/dependencies/generateColorStyleTag.js
+++ b/src/content/dependencies/generateColorStyleTag.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateColorStyleVariables', 'generateStyleTag'],
-  extraDependencies: ['html'],
-
   relations: (relation) => ({
     styleTag:
       relation('generateStyleTag'),
diff --git a/src/content/dependencies/generateColorStyleVariables.js b/src/content/dependencies/generateColorStyleVariables.js
index c872d0b6..0865ed3e 100644
--- a/src/content/dependencies/generateColorStyleVariables.js
+++ b/src/content/dependencies/generateColorStyleVariables.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html', 'getColors'],
-
   slots: {
     color: {
       validate: v => v.isColor,
diff --git a/src/content/dependencies/generateCommentaryContentHeading.js b/src/content/dependencies/generateCommentaryContentHeading.js
index cf5667fa..691762aa 100644
--- a/src/content/dependencies/generateCommentaryContentHeading.js
+++ b/src/content/dependencies/generateCommentaryContentHeading.js
@@ -1,9 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: ['generateContentContentHeading'],
-  extraDependencies: ['language'],
-
   query: (thing) => ({
     entries:
       (thing.isTrack
diff --git a/src/content/dependencies/generateCommentaryEntry.js b/src/content/dependencies/generateCommentaryEntry.js
index 57f96215..38eb6b43 100644
--- a/src/content/dependencies/generateCommentaryEntry.js
+++ b/src/content/dependencies/generateCommentaryEntry.js
@@ -1,15 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateCommentaryEntryDate',
-    'generateColorStyleAttribute',
-    'linkArtist',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, entry) => ({
     artistLinks:
       (!empty(entry.artists) && !entry.artistText
diff --git a/src/content/dependencies/generateCommentaryEntryDate.js b/src/content/dependencies/generateCommentaryEntryDate.js
index f1cf5cb3..e924f244 100644
--- a/src/content/dependencies/generateCommentaryEntryDate.js
+++ b/src/content/dependencies/generateCommentaryEntryDate.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateTextWithTooltip', 'generateTooltip'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, _entry) => ({
     textWithTooltip:
       relation('generateTextWithTooltip'),
diff --git a/src/content/dependencies/generateCommentaryIndexPage.js b/src/content/dependencies/generateCommentaryIndexPage.js
index d68ba42e..4da3ecb9 100644
--- a/src/content/dependencies/generateCommentaryIndexPage.js
+++ b/src/content/dependencies/generateCommentaryIndexPage.js
@@ -2,9 +2,6 @@ import {sortChronologically} from '#sort';
 import {accumulateSum, filterMultipleArrays, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generatePageLayout', 'linkAlbumCommentary'],
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl({albumData}) {
     return {albumData};
   },
diff --git a/src/content/dependencies/generateContentContentHeading.js b/src/content/dependencies/generateContentContentHeading.js
index 54ffa205..9ed2d9f0 100644
--- a/src/content/dependencies/generateContentContentHeading.js
+++ b/src/content/dependencies/generateContentContentHeading.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateContentHeading'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, _thing) => ({
     contentHeading:
       relation('generateContentHeading'),
diff --git a/src/content/dependencies/generateContentHeading.js b/src/content/dependencies/generateContentHeading.js
index f52bc043..a7cf201f 100644
--- a/src/content/dependencies/generateContentHeading.js
+++ b/src/content/dependencies/generateContentHeading.js
@@ -1,7 +1,5 @@
 export default {
   extraDependencies: ['html'],
-  contentDependencies: ['generateColorStyleAttribute'],
-
   relations: (relation) => ({
     colorStyle: relation('generateColorStyleAttribute'),
   }),
diff --git a/src/content/dependencies/generateContributionList.js b/src/content/dependencies/generateContributionList.js
index d1c3de0f..3716bcd6 100644
--- a/src/content/dependencies/generateContributionList.js
+++ b/src/content/dependencies/generateContributionList.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkContribution'],
-  extraDependencies: ['html'],
-
   relations: (relation, contributions) => ({
     contributionLinks:
       contributions
diff --git a/src/content/dependencies/generateContributionTooltip.js b/src/content/dependencies/generateContributionTooltip.js
index b5da59b4..fd16371b 100644
--- a/src/content/dependencies/generateContributionTooltip.js
+++ b/src/content/dependencies/generateContributionTooltip.js
@@ -32,14 +32,6 @@ function getSiblings(contribution) {
 }
 
 export default {
-  contentDependencies: [
-    'generateContributionTooltipChronologySection',
-    'generateContributionTooltipExternalLinkSection',
-    'generateTooltip',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (contribution) => ({
     albumArtistContribution:
       (contribution.thing.isTrack
diff --git a/src/content/dependencies/generateContributionTooltipChronologySection.js b/src/content/dependencies/generateContributionTooltipChronologySection.js
index 4ee9bb35..e4b9bfda 100644
--- a/src/content/dependencies/generateContributionTooltipChronologySection.js
+++ b/src/content/dependencies/generateContributionTooltipChronologySection.js
@@ -25,9 +25,6 @@ function getSiblings(contribution) {
 }
 
 export default {
-  contentDependencies: ['linkAnythingMan'],
-  extraDependencies: ['html', 'language'],
-
   query: (contribution) => ({
     ...getSiblings(contribution),
   }),
diff --git a/src/content/dependencies/generateContributionTooltipExternalLinkSection.js b/src/content/dependencies/generateContributionTooltipExternalLinkSection.js
index 4f9a23ed..210db1e9 100644
--- a/src/content/dependencies/generateContributionTooltipExternalLinkSection.js
+++ b/src/content/dependencies/generateContributionTooltipExternalLinkSection.js
@@ -1,14 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateExternalHandle',
-    'generateExternalIcon',
-    'generateExternalPlatform',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, contribution) => ({
     icons:
       contribution.artist.urls
diff --git a/src/content/dependencies/generateCoverArtwork.js b/src/content/dependencies/generateCoverArtwork.js
index f9e942ff..89b66ce0 100644
--- a/src/content/dependencies/generateCoverArtwork.js
+++ b/src/content/dependencies/generateCoverArtwork.js
@@ -1,15 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generateCoverArtworkArtTagDetails',
-    'generateCoverArtworkArtistDetails',
-    'generateCoverArtworkOriginDetails',
-    'generateCoverArtworkReferenceDetails',
-    'image',
-  ],
-
-  extraDependencies: ['html'],
-
   relations: (relation, artwork) => ({
     colorStyleAttribute:
       relation('generateColorStyleAttribute'),
diff --git a/src/content/dependencies/generateCoverArtworkArtTagDetails.js b/src/content/dependencies/generateCoverArtworkArtTagDetails.js
index 4d908665..50571a4f 100644
--- a/src/content/dependencies/generateCoverArtworkArtTagDetails.js
+++ b/src/content/dependencies/generateCoverArtworkArtTagDetails.js
@@ -5,9 +5,6 @@ function linkable(tag) {
 }
 
 export default {
-  contentDependencies: ['linkArtTagGallery'],
-  extraDependencies: ['html', 'language'],
-
   query: (artwork) => ({
     linkableArtTags:
       artwork.artTags.filter(linkable),
diff --git a/src/content/dependencies/generateCoverArtworkArtistDetails.js b/src/content/dependencies/generateCoverArtworkArtistDetails.js
index 3ead80ab..2773c6fc 100644
--- a/src/content/dependencies/generateCoverArtworkArtistDetails.js
+++ b/src/content/dependencies/generateCoverArtworkArtistDetails.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkArtistGallery'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, artwork) => ({
     artistLinks:
       artwork.artistContribs
diff --git a/src/content/dependencies/generateCoverArtworkOriginDetails.js b/src/content/dependencies/generateCoverArtworkOriginDetails.js
index 06e1c06c..db18e9e4 100644
--- a/src/content/dependencies/generateCoverArtworkOriginDetails.js
+++ b/src/content/dependencies/generateCoverArtworkOriginDetails.js
@@ -1,13 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateArtistCredit',
-    'generateAbsoluteDatetimestamp',
-    'linkAlbum',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language', 'pagePath'],
-
   query: (artwork) => ({
     attachedArtistContribs:
       (artwork.attachedArtwork
diff --git a/src/content/dependencies/generateCoverArtworkReferenceDetails.js b/src/content/dependencies/generateCoverArtworkReferenceDetails.js
index 035ab586..d4e4e7e4 100644
--- a/src/content/dependencies/generateCoverArtworkReferenceDetails.js
+++ b/src/content/dependencies/generateCoverArtworkReferenceDetails.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkReferencedArtworks', 'linkReferencingArtworks'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, artwork) => ({
     referencedArtworksLink:
       relation('linkReferencedArtworks', artwork),
diff --git a/src/content/dependencies/generateCoverCarousel.js b/src/content/dependencies/generateCoverCarousel.js
index 0705d93e..1ffeff8e 100644
--- a/src/content/dependencies/generateCoverCarousel.js
+++ b/src/content/dependencies/generateCoverCarousel.js
@@ -2,8 +2,6 @@ import {empty, repeat, stitchArrays} from '#sugar';
 import {getCarouselLayoutForNumberOfItems} from '#wiki-data';
 
 export default {
-  extraDependencies: ['html'],
-
   slots: {
     images: {validate: v => v.strictArrayOf(v.isHTML)},
     links: {validate: v => v.strictArrayOf(v.isHTML)},
diff --git a/src/content/dependencies/generateCoverGrid.js b/src/content/dependencies/generateCoverGrid.js
index 53b2b8b8..091833a9 100644
--- a/src/content/dependencies/generateCoverGrid.js
+++ b/src/content/dependencies/generateCoverGrid.js
@@ -1,9 +1,6 @@
 import {empty, stitchArrays, unique} from '#sugar';
 
 export default {
-  contentDependencies: ['generateGridActionLinks', 'generateGridExpando'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation) => ({
     actionLinks:
       relation('generateGridActionLinks'),
diff --git a/src/content/dependencies/generateDatetimestampTemplate.js b/src/content/dependencies/generateDatetimestampTemplate.js
index a92d15fc..56b2e595 100644
--- a/src/content/dependencies/generateDatetimestampTemplate.js
+++ b/src/content/dependencies/generateDatetimestampTemplate.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateTextWithTooltip'],
-  extraDependencies: ['html'],
-
   relations: (relation) => ({
     textWithTooltip:
       relation('generateTextWithTooltip'),
diff --git a/src/content/dependencies/generateDotSwitcherTemplate.js b/src/content/dependencies/generateDotSwitcherTemplate.js
index 22205922..561a44bc 100644
--- a/src/content/dependencies/generateDotSwitcherTemplate.js
+++ b/src/content/dependencies/generateDotSwitcherTemplate.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html'],
-
   slots: {
     attributes: {
       type: 'attributes',
diff --git a/src/content/dependencies/generateExternalHandle.js b/src/content/dependencies/generateExternalHandle.js
index 8c0368a4..8653b177 100644
--- a/src/content/dependencies/generateExternalHandle.js
+++ b/src/content/dependencies/generateExternalHandle.js
@@ -1,8 +1,6 @@
 import {isExternalLinkContext} from '#external-links';
 
 export default {
-  extraDependencies: ['html', 'language'],
-
   data: (url) => ({url}),
 
   slots: {
diff --git a/src/content/dependencies/generateExternalIcon.js b/src/content/dependencies/generateExternalIcon.js
index 637af658..03af643e 100644
--- a/src/content/dependencies/generateExternalIcon.js
+++ b/src/content/dependencies/generateExternalIcon.js
@@ -1,8 +1,6 @@
 import {isExternalLinkContext} from '#external-links';
 
 export default {
-  extraDependencies: ['html', 'language', 'to'],
-
   data: (url) => ({url}),
 
   slots: {
diff --git a/src/content/dependencies/generateExternalPlatform.js b/src/content/dependencies/generateExternalPlatform.js
index c4f63ecf..b2822d64 100644
--- a/src/content/dependencies/generateExternalPlatform.js
+++ b/src/content/dependencies/generateExternalPlatform.js
@@ -1,8 +1,6 @@
 import {isExternalLinkContext} from '#external-links';
 
 export default {
-  extraDependencies: ['html', 'language'],
-
   data: (url) => ({url}),
 
   slots: {
diff --git a/src/content/dependencies/generateFlashActGalleryPage.js b/src/content/dependencies/generateFlashActGalleryPage.js
index 84ab549d..896ee224 100644
--- a/src/content/dependencies/generateFlashActGalleryPage.js
+++ b/src/content/dependencies/generateFlashActGalleryPage.js
@@ -1,19 +1,6 @@
 import striptags from 'striptags';
 
 export default {
-  contentDependencies: [
-    'generateCoverGrid',
-    'generateFlashActNavAccent',
-    'generateFlashActSidebar',
-    'generatePageLayout',
-    'image',
-    'linkFlash',
-    'linkFlashAct',
-    'linkFlashIndex',
-  ],
-
-  extraDependencies: ['language'],
-
   relations: (relation, act) => ({
     layout:
       relation('generatePageLayout'),
diff --git a/src/content/dependencies/generateFlashActNavAccent.js b/src/content/dependencies/generateFlashActNavAccent.js
index c4ec77b8..7ad46051 100644
--- a/src/content/dependencies/generateFlashActNavAccent.js
+++ b/src/content/dependencies/generateFlashActNavAccent.js
@@ -1,15 +1,6 @@
 import {atOffset} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateInterpageDotSwitcher',
-    'generateNextLink',
-    'generatePreviousLink',
-    'linkFlashAct',
-  ],
-
-  extraDependencies: ['wikiData'],
-
   sprawl: ({flashActData}) =>
     ({flashActData}),
 
diff --git a/src/content/dependencies/generateFlashActSidebar.js b/src/content/dependencies/generateFlashActSidebar.js
index 1421dde9..0d952077 100644
--- a/src/content/dependencies/generateFlashActSidebar.js
+++ b/src/content/dependencies/generateFlashActSidebar.js
@@ -1,10 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateFlashActSidebarCurrentActBox',
-    'generateFlashActSidebarSideMapBox',
-    'generatePageSidebar',
-  ],
-
   relations: (relation, act, flash) => ({
     sidebar:
       relation('generatePageSidebar'),
diff --git a/src/content/dependencies/generateFlashActSidebarCurrentActBox.js b/src/content/dependencies/generateFlashActSidebarCurrentActBox.js
index 6d152c7c..e08582fe 100644
--- a/src/content/dependencies/generateFlashActSidebarCurrentActBox.js
+++ b/src/content/dependencies/generateFlashActSidebarCurrentActBox.js
@@ -1,12 +1,4 @@
 export default {
-  contentDependencies: [
-    'generatePageSidebarBox',
-    'linkFlash',
-    'linkFlashAct',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, act, _flash) => ({
     box:
       relation('generatePageSidebarBox'),
diff --git a/src/content/dependencies/generateFlashActSidebarSideMapBox.js b/src/content/dependencies/generateFlashActSidebarSideMapBox.js
index 7b26ef31..4b97f21d 100644
--- a/src/content/dependencies/generateFlashActSidebarSideMapBox.js
+++ b/src/content/dependencies/generateFlashActSidebarSideMapBox.js
@@ -1,15 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generatePageSidebarBox',
-    'linkFlashAct',
-    'linkFlashIndex',
-  ],
-
-  extraDependencies: ['html', 'wikiData'],
-
   sprawl: ({flashSideData}) => ({flashSideData}),
 
   relations: (relation, sprawl, _act, _flash) => ({
diff --git a/src/content/dependencies/generateFlashArtworkColumn.js b/src/content/dependencies/generateFlashArtworkColumn.js
index 5987df9e..207c3bf3 100644
--- a/src/content/dependencies/generateFlashArtworkColumn.js
+++ b/src/content/dependencies/generateFlashArtworkColumn.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['generateCoverArtwork'],
-
   relations: (relation, flash) => ({
     coverArtwork:
       relation('generateCoverArtwork', flash.coverArtwork),
diff --git a/src/content/dependencies/generateFlashIndexPage.js b/src/content/dependencies/generateFlashIndexPage.js
index 2788406c..1fb286c6 100644
--- a/src/content/dependencies/generateFlashIndexPage.js
+++ b/src/content/dependencies/generateFlashIndexPage.js
@@ -1,17 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generateCoverGrid',
-    'generatePageLayout',
-    'image',
-    'linkFlash',
-    'linkFlashAct',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({flashActData}) => ({flashActData}),
 
   query(sprawl) {
diff --git a/src/content/dependencies/generateFlashInfoPage.js b/src/content/dependencies/generateFlashInfoPage.js
index effc07ff..86ec6648 100644
--- a/src/content/dependencies/generateFlashInfoPage.js
+++ b/src/content/dependencies/generateFlashInfoPage.js
@@ -14,25 +14,6 @@ function checkInterrupted(which, relations, {html}) {
 }
 
 export default {
-  contentDependencies: [
-    'generateAdditionalNamesBox',
-    'generateCollapsedContentEntrySection',
-    'generateCommentaryEntry',
-    'generateCommentaryContentHeading',
-    'generateContentHeading',
-    'generateContributionList',
-    'generateFlashActSidebar',
-    'generateFlashArtworkColumn',
-    'generateFlashNavAccent',
-    'generatePageLayout',
-    'generateReadCommentaryLine',
-    'generateTrackList',
-    'linkExternal',
-    'linkFlashAct',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query(flash) {
     const query = {};
 
diff --git a/src/content/dependencies/generateFlashNavAccent.js b/src/content/dependencies/generateFlashNavAccent.js
index 0f5d2d6b..db9d3c1e 100644
--- a/src/content/dependencies/generateFlashNavAccent.js
+++ b/src/content/dependencies/generateFlashNavAccent.js
@@ -1,15 +1,6 @@
 import {atOffset} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateInterpageDotSwitcher',
-    'generateNextLink',
-    'generatePreviousLink',
-    'linkFlash',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({flashActData}) =>
     ({flashActData}),
 
diff --git a/src/content/dependencies/generateFooterLocalizationLinks.js b/src/content/dependencies/generateFooterLocalizationLinks.js
index dfd83aef..efa1972a 100644
--- a/src/content/dependencies/generateFooterLocalizationLinks.js
+++ b/src/content/dependencies/generateFooterLocalizationLinks.js
@@ -2,15 +2,6 @@ import {sortByName} from '#sort';
 import {stitchArrays} from '#sugar';
 
 export default {
-  extraDependencies: [
-    'defaultLanguage',
-    'html',
-    'language',
-    'languages',
-    'pagePath',
-    'to',
-  ],
-
   generate({
     defaultLanguage,
     html,
diff --git a/src/content/dependencies/generateGridActionLinks.js b/src/content/dependencies/generateGridActionLinks.js
index 585a02b9..5b3f9c1e 100644
--- a/src/content/dependencies/generateGridActionLinks.js
+++ b/src/content/dependencies/generateGridActionLinks.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html'],
-
   slots: {
     actionLinks: {validate: v => v.sparseArrayOf(v.isHTML)},
   },
diff --git a/src/content/dependencies/generateGridExpando.js b/src/content/dependencies/generateGridExpando.js
index 71c2f970..5a0cbce5 100644
--- a/src/content/dependencies/generateGridExpando.js
+++ b/src/content/dependencies/generateGridExpando.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html', 'language'],
-
   slots: {
     caption: {type: 'html', mutable: false},
   },
diff --git a/src/content/dependencies/generateGroupGalleryPage.js b/src/content/dependencies/generateGroupGalleryPage.js
index 8e11f9e5..e378f8a2 100644
--- a/src/content/dependencies/generateGroupGalleryPage.js
+++ b/src/content/dependencies/generateGroupGalleryPage.js
@@ -2,22 +2,6 @@ import {sortChronologically} from '#sort';
 import {filterItemsForCarousel, getTotalDuration} from '#wiki-data';
 
 export default {
-  contentDependencies: [
-    'generateCoverCarousel',
-    'generateGroupGalleryPageAlbumsByDateView',
-    'generateGroupGalleryPageAlbumsBySeriesView',
-    'generateGroupNavLinks',
-    'generateGroupSecondaryNav',
-    'generateIntrapageDotSwitcher',
-    'generatePageLayout',
-    'generateQuickDescription',
-    'image',
-    'linkAlbum',
-    'linkListing',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({wikiInfo}) =>
     ({enableGroupUI: wikiInfo.enableGroupUI}),
 
diff --git a/src/content/dependencies/generateGroupGalleryPageAlbumGrid.js b/src/content/dependencies/generateGroupGalleryPageAlbumGrid.js
index 7b90fd68..37c1951d 100644
--- a/src/content/dependencies/generateGroupGalleryPageAlbumGrid.js
+++ b/src/content/dependencies/generateGroupGalleryPageAlbumGrid.js
@@ -2,15 +2,6 @@ import {stitchArrays} from '#sugar';
 import {getTotalDuration} from '#wiki-data';
 
 export default {
-  contentDependencies: [
-    'generateCoverGrid',
-    'generateGroupGalleryPageAlbumGridTab',
-    'image',
-    'linkAlbum',
-  ],
-
-  extraDependencies: ['language', 'wikiData'],
-
   query: (albums, _group) => ({
     artworks:
       albums.map(album =>
diff --git a/src/content/dependencies/generateGroupGalleryPageAlbumGridTab.js b/src/content/dependencies/generateGroupGalleryPageAlbumGridTab.js
index d86b61e1..c3b860e4 100644
--- a/src/content/dependencies/generateGroupGalleryPageAlbumGridTab.js
+++ b/src/content/dependencies/generateGroupGalleryPageAlbumGridTab.js
@@ -1,9 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: ['generateArtistCredit'],
-  extraDependencies: ['language'],
-
   query(album, group) {
     if (album.groups.length > 1) {
       const contextGroup = group;
diff --git a/src/content/dependencies/generateGroupGalleryPageAlbumsByDateView.js b/src/content/dependencies/generateGroupGalleryPageAlbumsByDateView.js
index 6bd0491f..75ef1048 100644
--- a/src/content/dependencies/generateGroupGalleryPageAlbumsByDateView.js
+++ b/src/content/dependencies/generateGroupGalleryPageAlbumsByDateView.js
@@ -1,13 +1,6 @@
 import {sortChronologically} from '#sort';
 
 export default {
-  contentDependencies: [
-    'generateGroupGalleryPageAlbumGrid',
-    'generateGroupGalleryPageStyleSelector',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (group) => ({
     albums:
       sortChronologically(group.albums.slice(), {latestFirst: true}),
diff --git a/src/content/dependencies/generateGroupGalleryPageAlbumsBySeriesView.js b/src/content/dependencies/generateGroupGalleryPageAlbumsBySeriesView.js
index 0337275f..68cf249f 100644
--- a/src/content/dependencies/generateGroupGalleryPageAlbumsBySeriesView.js
+++ b/src/content/dependencies/generateGroupGalleryPageAlbumsBySeriesView.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateGroupGalleryPageSeriesSection'],
-  extraDependencies: ['html'],
-
   relations: (relation, group) => ({
     seriesSections:
       group.serieses
diff --git a/src/content/dependencies/generateGroupGalleryPageSeriesSection.js b/src/content/dependencies/generateGroupGalleryPageSeriesSection.js
index b88adfa3..1aa835d6 100644
--- a/src/content/dependencies/generateGroupGalleryPageSeriesSection.js
+++ b/src/content/dependencies/generateGroupGalleryPageSeriesSection.js
@@ -1,13 +1,6 @@
 import {sortChronologically} from '#sort';
 
 export default {
-  contentDependencies: [
-    'generateContentHeading',
-    'generateGroupGalleryPageAlbumGrid',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query(series) {
     const query = {};
 
diff --git a/src/content/dependencies/generateGroupGalleryPageStyleSelector.js b/src/content/dependencies/generateGroupGalleryPageStyleSelector.js
index 4f9d02a9..9342e50f 100644
--- a/src/content/dependencies/generateGroupGalleryPageStyleSelector.js
+++ b/src/content/dependencies/generateGroupGalleryPageStyleSelector.js
@@ -1,8 +1,6 @@
 import {unique} from '#sugar';
 
 export default {
-  extraDependencies: ['html', 'language'],
-
   query: (group) => ({
     styles:
       unique(group.albums.map(album => album.style)),
diff --git a/src/content/dependencies/generateGroupInfoPage.js b/src/content/dependencies/generateGroupInfoPage.js
index 7b9c2afa..0f3093b2 100644
--- a/src/content/dependencies/generateGroupInfoPage.js
+++ b/src/content/dependencies/generateGroupInfoPage.js
@@ -1,20 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generateGroupInfoPageAlbumsSection',
-    'generateGroupNavLinks',
-    'generateGroupSecondaryNav',
-    'generateGroupSidebar',
-    'generatePageLayout',
-    'linkArtist',
-    'linkExternal',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({wikiInfo}) => ({
     enableGroupUI:
       wikiInfo.enableGroupUI,
diff --git a/src/content/dependencies/generateGroupInfoPageAlbumsListByDate.js b/src/content/dependencies/generateGroupInfoPageAlbumsListByDate.js
index df42598d..de55f33a 100644
--- a/src/content/dependencies/generateGroupInfoPageAlbumsListByDate.js
+++ b/src/content/dependencies/generateGroupInfoPageAlbumsListByDate.js
@@ -1,10 +1,6 @@
 import {sortChronologically} from '#sort';
 
 export default {
-  contentDependencies: ['generateGroupInfoPageAlbumsListItem'],
-
-  extraDependencies: ['html'],
-
   query: (group) => ({
     // Typically, a latestFirst: false (default) chronological sort would be
     // appropriate here, but navigation between adjacent albums in a group is a
diff --git a/src/content/dependencies/generateGroupInfoPageAlbumsListBySeries.js b/src/content/dependencies/generateGroupInfoPageAlbumsListBySeries.js
index bcd5d288..f8314d71 100644
--- a/src/content/dependencies/generateGroupInfoPageAlbumsListBySeries.js
+++ b/src/content/dependencies/generateGroupInfoPageAlbumsListBySeries.js
@@ -1,13 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateContentHeading',
-    'generateGroupInfoPageAlbumsListItem',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (group) => ({
     closelyLinkedArtists:
       group.closelyLinkedArtists
diff --git a/src/content/dependencies/generateGroupInfoPageAlbumsListItem.js b/src/content/dependencies/generateGroupInfoPageAlbumsListItem.js
index cec18240..09b0a542 100644
--- a/src/content/dependencies/generateGroupInfoPageAlbumsListItem.js
+++ b/src/content/dependencies/generateGroupInfoPageAlbumsListItem.js
@@ -1,16 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateAbsoluteDatetimestamp',
-    'generateArtistCredit',
-    'generateColorStyleAttribute',
-    'linkAlbum',
-    'linkGroup',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (album, group) => {
     const otherCategory =
       album.groups
diff --git a/src/content/dependencies/generateGroupInfoPageAlbumsSection.js b/src/content/dependencies/generateGroupInfoPageAlbumsSection.js
index 0b678e9d..4470eb2f 100644
--- a/src/content/dependencies/generateGroupInfoPageAlbumsSection.js
+++ b/src/content/dependencies/generateGroupInfoPageAlbumsSection.js
@@ -1,14 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateContentHeading',
-    'generateGroupInfoPageAlbumsListByDate',
-    'generateGroupInfoPageAlbumsListBySeries',
-    'generateIntrapageDotSwitcher',
-    'linkGroupGallery',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, group) => ({
     contentHeading:
       relation('generateContentHeading'),
diff --git a/src/content/dependencies/generateGroupNavAccent.js b/src/content/dependencies/generateGroupNavAccent.js
index 0e4ebe8a..18281bf0 100644
--- a/src/content/dependencies/generateGroupNavAccent.js
+++ b/src/content/dependencies/generateGroupNavAccent.js
@@ -1,14 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateInterpageDotSwitcher',
-    'linkGroup',
-    'linkGroupGallery',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, group) => ({
     switcher:
       relation('generateInterpageDotSwitcher'),
diff --git a/src/content/dependencies/generateGroupNavLinks.js b/src/content/dependencies/generateGroupNavLinks.js
index bdc3ee4c..4f13e474 100644
--- a/src/content/dependencies/generateGroupNavLinks.js
+++ b/src/content/dependencies/generateGroupNavLinks.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateGroupNavAccent', 'linkGroup'],
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({groupCategoryData, wikiInfo}) => ({
     groupCategoryData,
     enableGroupUI: wikiInfo.enableGroupUI,
diff --git a/src/content/dependencies/generateGroupSecondaryNav.js b/src/content/dependencies/generateGroupSecondaryNav.js
index c48f3142..6b4347dd 100644
--- a/src/content/dependencies/generateGroupSecondaryNav.js
+++ b/src/content/dependencies/generateGroupSecondaryNav.js
@@ -1,9 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateSecondaryNav',
-    'generateGroupSecondaryNavCategoryPart',
-  ],
-
   relations: (relation, group) => ({
     secondaryNav:
       relation('generateSecondaryNav'),
diff --git a/src/content/dependencies/generateGroupSecondaryNavCategoryPart.js b/src/content/dependencies/generateGroupSecondaryNavCategoryPart.js
index b2adb9f8..df627c99 100644
--- a/src/content/dependencies/generateGroupSecondaryNavCategoryPart.js
+++ b/src/content/dependencies/generateGroupSecondaryNavCategoryPart.js
@@ -1,15 +1,6 @@
 import {atOffset} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generateSecondaryNavParentSiblingsPart',
-    'linkGroupDynamically',
-    'linkListing',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({listingSpec, wikiInfo}) => ({
     groupsByCategoryListing:
       (wikiInfo.enableListings
diff --git a/src/content/dependencies/generateGroupSidebar.js b/src/content/dependencies/generateGroupSidebar.js
index 0888cbbe..1359eaca 100644
--- a/src/content/dependencies/generateGroupSidebar.js
+++ b/src/content/dependencies/generateGroupSidebar.js
@@ -1,12 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateGroupSidebarCategoryDetails',
-    'generatePageSidebar',
-    'generatePageSidebarBox',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({groupCategoryData}) => ({groupCategoryData}),
 
   relations: (relation, sprawl, group) => ({
diff --git a/src/content/dependencies/generateGroupSidebarCategoryDetails.js b/src/content/dependencies/generateGroupSidebarCategoryDetails.js
index 208ccd07..a7e1f240 100644
--- a/src/content/dependencies/generateGroupSidebarCategoryDetails.js
+++ b/src/content/dependencies/generateGroupSidebarCategoryDetails.js
@@ -1,14 +1,6 @@
 import {empty, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'linkGroup',
-    'linkGroupGallery',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations(relation, category) {
     return {
       colorStyle:
diff --git a/src/content/dependencies/generateImageOverlay.js b/src/content/dependencies/generateImageOverlay.js
index cfb78a1b..006cfcce 100644
--- a/src/content/dependencies/generateImageOverlay.js
+++ b/src/content/dependencies/generateImageOverlay.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html', 'language'],
-
   generate: ({html, language}) =>
     html.tag('div', {id: 'image-overlay-container'},
       html.tag('div', {id: 'image-overlay-content-container'}, [
diff --git a/src/content/dependencies/generateInterpageDotSwitcher.js b/src/content/dependencies/generateInterpageDotSwitcher.js
index 5a33444e..ddb7cb37 100644
--- a/src/content/dependencies/generateInterpageDotSwitcher.js
+++ b/src/content/dependencies/generateInterpageDotSwitcher.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateDotSwitcherTemplate'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation) => ({
     template:
       relation('generateDotSwitcherTemplate'),
diff --git a/src/content/dependencies/generateIntrapageDotSwitcher.js b/src/content/dependencies/generateIntrapageDotSwitcher.js
index cd92b165..943d862c 100644
--- a/src/content/dependencies/generateIntrapageDotSwitcher.js
+++ b/src/content/dependencies/generateIntrapageDotSwitcher.js
@@ -1,9 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateDotSwitcherTemplate'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation) => ({
     template:
       relation('generateDotSwitcherTemplate'),
diff --git a/src/content/dependencies/generateListAllAdditionalFilesAlbumChunk.js b/src/content/dependencies/generateListAllAdditionalFilesAlbumChunk.js
index 0a929429..e381a745 100644
--- a/src/content/dependencies/generateListAllAdditionalFilesAlbumChunk.js
+++ b/src/content/dependencies/generateListAllAdditionalFilesAlbumChunk.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateListAllAdditionalFilesChunk'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, _album, additionalFiles) => ({
     chunk:
       relation('generateListAllAdditionalFilesChunk', additionalFiles),
diff --git a/src/content/dependencies/generateListAllAdditionalFilesAlbumSection.js b/src/content/dependencies/generateListAllAdditionalFilesAlbumSection.js
index a0af1375..0f14f12c 100644
--- a/src/content/dependencies/generateListAllAdditionalFilesAlbumSection.js
+++ b/src/content/dependencies/generateListAllAdditionalFilesAlbumSection.js
@@ -1,13 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateContentHeading',
-    'generateListAllAdditionalFilesAlbumChunk',
-    'generateListAllAdditionalFilesTrackChunk',
-    'linkAlbum',
-  ],
-
-  extraDependencies: ['html'],
-
   relations: (relation, album, property) => ({
     heading:
       relation('generateContentHeading'),
diff --git a/src/content/dependencies/generateListAllAdditionalFilesChunk.js b/src/content/dependencies/generateListAllAdditionalFilesChunk.js
index df652efd..d68e3bc1 100644
--- a/src/content/dependencies/generateListAllAdditionalFilesChunk.js
+++ b/src/content/dependencies/generateListAllAdditionalFilesChunk.js
@@ -1,9 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['linkAdditionalFile'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, additionalFiles) => ({
     links:
       additionalFiles
diff --git a/src/content/dependencies/generateListAllAdditionalFilesTrackChunk.js b/src/content/dependencies/generateListAllAdditionalFilesTrackChunk.js
index b2e5addf..9ac79bb5 100644
--- a/src/content/dependencies/generateListAllAdditionalFilesTrackChunk.js
+++ b/src/content/dependencies/generateListAllAdditionalFilesTrackChunk.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateListAllAdditionalFilesChunk', 'linkTrack'],
-  extraDependencies: ['html'],
-
   relations: (relation, track, additionalFiles) => ({
     trackLink:
       relation('linkTrack', track),
diff --git a/src/content/dependencies/generateListRandomPageLinksAlbumLink.js b/src/content/dependencies/generateListRandomPageLinksAlbumLink.js
index b3560aca..29e7b1c9 100644
--- a/src/content/dependencies/generateListRandomPageLinksAlbumLink.js
+++ b/src/content/dependencies/generateListRandomPageLinksAlbumLink.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkAlbum'],
-
   data: (album) =>
     ({directory: album.directory}),
 
diff --git a/src/content/dependencies/generateListingIndexList.js b/src/content/dependencies/generateListingIndexList.js
index 78622e6e..db494f37 100644
--- a/src/content/dependencies/generateListingIndexList.js
+++ b/src/content/dependencies/generateListingIndexList.js
@@ -1,9 +1,6 @@
 import {empty, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['linkListing'],
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl({listingTargetSpec, wikiInfo}) {
     return {listingTargetSpec, wikiInfo};
   },
diff --git a/src/content/dependencies/generateListingPage.js b/src/content/dependencies/generateListingPage.js
index 5f9a99a9..7ba59979 100644
--- a/src/content/dependencies/generateListingPage.js
+++ b/src/content/dependencies/generateListingPage.js
@@ -1,17 +1,6 @@
 import {bindOpts, empty, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateContentHeading',
-    'generateListingSidebar',
-    'generatePageLayout',
-    'linkListing',
-    'linkListingIndex',
-    'linkTemplate',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   relations(relation, listing) {
     const relations = {};
 
diff --git a/src/content/dependencies/generateListingSidebar.js b/src/content/dependencies/generateListingSidebar.js
index aeac05cf..2d9429cf 100644
--- a/src/content/dependencies/generateListingSidebar.js
+++ b/src/content/dependencies/generateListingSidebar.js
@@ -1,13 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateListingIndexList',
-    'generatePageSidebar',
-    'generatePageSidebarBox',
-    'linkListingIndex',
-  ],
-
-  extraDependencies: ['html'],
-
   relations: (relation, currentListing) => ({
     sidebar:
       relation('generatePageSidebar'),
diff --git a/src/content/dependencies/generateListingsIndexPage.js b/src/content/dependencies/generateListingsIndexPage.js
index d0eff96f..80963d12 100644
--- a/src/content/dependencies/generateListingsIndexPage.js
+++ b/src/content/dependencies/generateListingsIndexPage.js
@@ -1,14 +1,6 @@
 import {getTotalDuration} from '#wiki-data';
 
 export default {
-  contentDependencies: [
-    'generateListingIndexList',
-    'generateListingSidebar',
-    'generatePageLayout',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl({albumData, trackData, wikiInfo}) {
     return {
       wikiName: wikiInfo.name,
diff --git a/src/content/dependencies/generateLyricsEntry.js b/src/content/dependencies/generateLyricsEntry.js
index 4c69605e..15f84b27 100644
--- a/src/content/dependencies/generateLyricsEntry.js
+++ b/src/content/dependencies/generateLyricsEntry.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkArtist', 'linkExternal', 'transformContent'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, entry) => ({
     content:
       relation('transformContent', entry.body),
diff --git a/src/content/dependencies/generateLyricsSection.js b/src/content/dependencies/generateLyricsSection.js
index 64676d3b..bbc3a776 100644
--- a/src/content/dependencies/generateLyricsSection.js
+++ b/src/content/dependencies/generateLyricsSection.js
@@ -1,15 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateContentHeading',
-    'generateIntrapageDotSwitcher',
-    'generateLyricsEntry',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, entries) => ({
     heading:
       relation('generateContentHeading'),
diff --git a/src/content/dependencies/generateNewsEntryNavAccent.js b/src/content/dependencies/generateNewsEntryNavAccent.js
index 5d168e41..05248eb3 100644
--- a/src/content/dependencies/generateNewsEntryNavAccent.js
+++ b/src/content/dependencies/generateNewsEntryNavAccent.js
@@ -1,11 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateInterpageDotSwitcher',
-    'generateNextLink',
-    'generatePreviousLink',
-    'linkNewsEntry',
-  ],
-
   relations: (relation, previousEntry, nextEntry) => ({
     switcher:
       relation('generateInterpageDotSwitcher'),
diff --git a/src/content/dependencies/generateNewsEntryPage.js b/src/content/dependencies/generateNewsEntryPage.js
index 4abd87d1..bbfb886d 100644
--- a/src/content/dependencies/generateNewsEntryPage.js
+++ b/src/content/dependencies/generateNewsEntryPage.js
@@ -2,16 +2,6 @@ import {sortChronologically} from '#sort';
 import {atOffset} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateNewsEntryNavAccent',
-    'generateNewsEntryReadAnotherLinks',
-    'generatePageLayout',
-    'linkNewsIndex',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl({newsData}) {
     return {newsData};
   },
diff --git a/src/content/dependencies/generateNewsEntryReadAnotherLinks.js b/src/content/dependencies/generateNewsEntryReadAnotherLinks.js
index d978b0e4..a985742b 100644
--- a/src/content/dependencies/generateNewsEntryReadAnotherLinks.js
+++ b/src/content/dependencies/generateNewsEntryReadAnotherLinks.js
@@ -1,12 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateAbsoluteDatetimestamp',
-    'generateRelativeDatetimestamp',
-    'linkNewsEntry',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations(relation, currentEntry, previousEntry, nextEntry) {
     const relations = {};
 
diff --git a/src/content/dependencies/generateNewsIndexPage.js b/src/content/dependencies/generateNewsIndexPage.js
index 02964ce8..d88bfdba 100644
--- a/src/content/dependencies/generateNewsIndexPage.js
+++ b/src/content/dependencies/generateNewsIndexPage.js
@@ -2,14 +2,6 @@ import {sortChronologically} from '#sort';
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generatePageLayout',
-    'linkNewsEntry',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl({newsData}) {
     return {newsData};
   },
diff --git a/src/content/dependencies/generateNextLink.js b/src/content/dependencies/generateNextLink.js
index 2e48cd2b..2c497e12 100644
--- a/src/content/dependencies/generateNextLink.js
+++ b/src/content/dependencies/generateNextLink.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['generatePreviousNextLink'],
-
   relations: (relation) => ({
     link:
       relation('generatePreviousNextLink'),
diff --git a/src/content/dependencies/generatePageLayout.js b/src/content/dependencies/generatePageLayout.js
index 4318f462..324a5ee4 100644
--- a/src/content/dependencies/generatePageLayout.js
+++ b/src/content/dependencies/generatePageLayout.js
@@ -2,28 +2,6 @@ import {openAggregate} from '#aggregate';
 import {atOffset, empty, repeat} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateColorStyleTag',
-    'generateFooterLocalizationLinks',
-    'generateImageOverlay',
-    'generatePageSidebar',
-    'generateSearchSidebarBox',
-    'generateStaticURLStyleTag',
-    'generateStickyHeadingContainer',
-    'generateWikiWallpaperStyleTag',
-    'transformContent',
-  ],
-
-  extraDependencies: [
-    'getColors',
-    'html',
-    'language',
-    'pagePath',
-    'pagePathStringFromRoot',
-    'to',
-    'wikiData',
-  ],
-
   sprawl: ({wikiInfo}) => ({
     enableSearch: wikiInfo.enableSearch,
     footerContent: wikiInfo.footerContent,
diff --git a/src/content/dependencies/generatePageSidebar.js b/src/content/dependencies/generatePageSidebar.js
index d3b55580..dfe85632 100644
--- a/src/content/dependencies/generatePageSidebar.js
+++ b/src/content/dependencies/generatePageSidebar.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html'],
-
   slots: {
     // Attributes to apply to the whole sidebar. This be added to the
     // containing sidebar-column, arr - specify attributes on each section if
diff --git a/src/content/dependencies/generatePageSidebarBox.js b/src/content/dependencies/generatePageSidebarBox.js
index 26b30494..3133aa64 100644
--- a/src/content/dependencies/generatePageSidebarBox.js
+++ b/src/content/dependencies/generatePageSidebarBox.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html'],
-
   slots: {
     content: {
       type: 'html',
diff --git a/src/content/dependencies/generatePageSidebarConjoinedBox.js b/src/content/dependencies/generatePageSidebarConjoinedBox.js
index 7974c707..4ed0ff22 100644
--- a/src/content/dependencies/generatePageSidebarConjoinedBox.js
+++ b/src/content/dependencies/generatePageSidebarConjoinedBox.js
@@ -4,9 +4,6 @@
 // templates' resolved content), take care when slotting into this.
 
 export default {
-  contentDependencies: ['generatePageSidebarBox'],
-  extraDependencies: ['html'],
-
   relations: (relation) => ({
     box:
       relation('generatePageSidebarBox'),
diff --git a/src/content/dependencies/generatePreviousLink.js b/src/content/dependencies/generatePreviousLink.js
index 775367f9..29146a21 100644
--- a/src/content/dependencies/generatePreviousLink.js
+++ b/src/content/dependencies/generatePreviousLink.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['generatePreviousNextLink'],
-
   relations: (relation) => ({
     link:
       relation('generatePreviousNextLink'),
diff --git a/src/content/dependencies/generatePreviousNextLink.js b/src/content/dependencies/generatePreviousNextLink.js
index afae1228..1e98358f 100644
--- a/src/content/dependencies/generatePreviousNextLink.js
+++ b/src/content/dependencies/generatePreviousNextLink.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html', 'language'],
-
   slots: {
     link: {
       type: 'html',
diff --git a/src/content/dependencies/generateQuickDescription.js b/src/content/dependencies/generateQuickDescription.js
index e144503e..f67f9514 100644
--- a/src/content/dependencies/generateQuickDescription.js
+++ b/src/content/dependencies/generateQuickDescription.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['transformContent'],
-  extraDependencies: ['html', 'language'],
-
   query: (thing) => ({
     hasDescription:
       !!thing.description,
diff --git a/src/content/dependencies/generateReadCommentaryLine.js b/src/content/dependencies/generateReadCommentaryLine.js
index 6f99256f..05700536 100644
--- a/src/content/dependencies/generateReadCommentaryLine.js
+++ b/src/content/dependencies/generateReadCommentaryLine.js
@@ -1,8 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  extraDependencies: ['html', 'language'],
-
   query: (thing) => ({
     entries:
       (thing.isTrack
diff --git a/src/content/dependencies/generateReferencedArtworksPage.js b/src/content/dependencies/generateReferencedArtworksPage.js
index 83451eca..2f47b7a5 100644
--- a/src/content/dependencies/generateReferencedArtworksPage.js
+++ b/src/content/dependencies/generateReferencedArtworksPage.js
@@ -1,14 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateCoverArtwork',
-    'generateCoverGrid',
-    'generatePageLayout',
-    'image',
-    'linkAnythingMan',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, artwork) => ({
     layout:
       relation('generatePageLayout'),
diff --git a/src/content/dependencies/generateReferencingArtworksPage.js b/src/content/dependencies/generateReferencingArtworksPage.js
index e97b01f8..abb92732 100644
--- a/src/content/dependencies/generateReferencingArtworksPage.js
+++ b/src/content/dependencies/generateReferencingArtworksPage.js
@@ -1,14 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateCoverArtwork',
-    'generateCoverGrid',
-    'generatePageLayout',
-    'image',
-    'linkAnythingMan',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, artwork) => ({
     layout:
       relation('generatePageLayout'),
diff --git a/src/content/dependencies/generateRelativeDatetimestamp.js b/src/content/dependencies/generateRelativeDatetimestamp.js
index a997de0e..b3fe6239 100644
--- a/src/content/dependencies/generateRelativeDatetimestamp.js
+++ b/src/content/dependencies/generateRelativeDatetimestamp.js
@@ -1,12 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateAbsoluteDatetimestamp',
-    'generateDatetimestampTemplate',
-    'generateTooltip',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   data: (currentDate, referenceDate) =>
     (currentDate.getTime() === referenceDate.getTime()
       ? {equal: true, date: currentDate}
diff --git a/src/content/dependencies/generateReleaseInfoContributionsLine.js b/src/content/dependencies/generateReleaseInfoContributionsLine.js
index a597b68a..4353ccf4 100644
--- a/src/content/dependencies/generateReleaseInfoContributionsLine.js
+++ b/src/content/dependencies/generateReleaseInfoContributionsLine.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateArtistCredit'],
-  extraDependencies: ['html'],
-
   relations: (relation, contributions, formatText) => ({
     credit:
       relation('generateArtistCredit', contributions, [], formatText),
diff --git a/src/content/dependencies/generateReleaseInfoListenLine.js b/src/content/dependencies/generateReleaseInfoListenLine.js
index b02ff6f9..97f248d6 100644
--- a/src/content/dependencies/generateReleaseInfoListenLine.js
+++ b/src/content/dependencies/generateReleaseInfoListenLine.js
@@ -24,9 +24,6 @@ function getReleaseContext(urlString, {
 }
 
 export default {
-  contentDependencies: ['linkExternal'],
-  extraDependencies: ['html', 'language'],
-
   query(thing) {
     const query = {};
 
diff --git a/src/content/dependencies/generateSearchSidebarBox.js b/src/content/dependencies/generateSearchSidebarBox.js
index 87785906..701a01ac 100644
--- a/src/content/dependencies/generateSearchSidebarBox.js
+++ b/src/content/dependencies/generateSearchSidebarBox.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generatePageSidebarBox'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation) => ({
     sidebarBox:
       relation('generatePageSidebarBox'),
diff --git a/src/content/dependencies/generateSecondaryNav.js b/src/content/dependencies/generateSecondaryNav.js
index 9ce7ce9b..63b3839b 100644
--- a/src/content/dependencies/generateSecondaryNav.js
+++ b/src/content/dependencies/generateSecondaryNav.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html'],
-
   slots: {
     content: {
       type: 'html',
diff --git a/src/content/dependencies/generateSecondaryNavParentSiblingsPart.js b/src/content/dependencies/generateSecondaryNavParentSiblingsPart.js
index f204f1fb..fe7c17ac 100644
--- a/src/content/dependencies/generateSecondaryNavParentSiblingsPart.js
+++ b/src/content/dependencies/generateSecondaryNavParentSiblingsPart.js
@@ -1,15 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generateInterpageDotSwitcher',
-    'generateNextLink',
-    'generatePreviousLink',
-    'linkAlbumDynamically',
-    'linkGroup',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation) => ({
     switcher:
       relation('generateInterpageDotSwitcher'),
diff --git a/src/content/dependencies/generateSocialEmbed.js b/src/content/dependencies/generateSocialEmbed.js
index 513ea518..5fa9376c 100644
--- a/src/content/dependencies/generateSocialEmbed.js
+++ b/src/content/dependencies/generateSocialEmbed.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['absoluteTo', 'html', 'language', 'wikiData'],
-
   sprawl({wikiInfo}) {
     return {
       canonicalBase: wikiInfo.canonicalBase,
diff --git a/src/content/dependencies/generateStaticPage.js b/src/content/dependencies/generateStaticPage.js
index 931352b4..485b802e 100644
--- a/src/content/dependencies/generateStaticPage.js
+++ b/src/content/dependencies/generateStaticPage.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generatePageLayout', 'transformContent'],
-  extraDependencies: ['html'],
-
   relations(relation, staticPage) {
     return {
       layout: relation('generatePageLayout'),
diff --git a/src/content/dependencies/generateStaticURLStyleTag.js b/src/content/dependencies/generateStaticURLStyleTag.js
index b927e5d6..443a4d08 100644
--- a/src/content/dependencies/generateStaticURLStyleTag.js
+++ b/src/content/dependencies/generateStaticURLStyleTag.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateStyleTag'],
-  extraDependencies: ['to'],
-
   relations: (relation) => ({
     styleTag:
       relation('generateStyleTag'),
diff --git a/src/content/dependencies/generateStickyHeadingContainer.js b/src/content/dependencies/generateStickyHeadingContainer.js
index ec3062a3..f7388d60 100644
--- a/src/content/dependencies/generateStickyHeadingContainer.js
+++ b/src/content/dependencies/generateStickyHeadingContainer.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html'],
-
   slots: {
     rootAttributes: {
       type: 'attributes',
diff --git a/src/content/dependencies/generateStyleTag.js b/src/content/dependencies/generateStyleTag.js
index 5ed09ae5..cdeadcfe 100644
--- a/src/content/dependencies/generateStyleTag.js
+++ b/src/content/dependencies/generateStyleTag.js
@@ -7,8 +7,6 @@ const indent = text =>
     .join('\n');
 
 export default {
-  extraDependencies: ['html'],
-
   slots: {
     attributes: {
       type: 'attributes',
diff --git a/src/content/dependencies/generateTextWithTooltip.js b/src/content/dependencies/generateTextWithTooltip.js
index 49ce1f61..360cfebc 100644
--- a/src/content/dependencies/generateTextWithTooltip.js
+++ b/src/content/dependencies/generateTextWithTooltip.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html'],
-
   slots: {
     attributes: {
       type: 'attributes',
diff --git a/src/content/dependencies/generateTooltip.js b/src/content/dependencies/generateTooltip.js
index b09ee230..6f23af6d 100644
--- a/src/content/dependencies/generateTooltip.js
+++ b/src/content/dependencies/generateTooltip.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html'],
-
   slots: {
     attributes: {
       type: 'attributes',
diff --git a/src/content/dependencies/generateTrackArtistCommentarySection.js b/src/content/dependencies/generateTrackArtistCommentarySection.js
index 5ed24d6c..39a3e145 100644
--- a/src/content/dependencies/generateTrackArtistCommentarySection.js
+++ b/src/content/dependencies/generateTrackArtistCommentarySection.js
@@ -1,15 +1,6 @@
 import {empty, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateCommentaryContentHeading',
-    'generateCommentaryEntry',
-    'linkAlbum',
-    'linkTrack',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (track) => ({
     otherSecondaryReleasesWithCommentary:
       track.otherReleases
diff --git a/src/content/dependencies/generateTrackArtworkColumn.js b/src/content/dependencies/generateTrackArtworkColumn.js
index f06d735b..234586e0 100644
--- a/src/content/dependencies/generateTrackArtworkColumn.js
+++ b/src/content/dependencies/generateTrackArtworkColumn.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateCoverArtwork'],
-  extraDependencies: ['html'],
-
   relations: (relation, track) => ({
     albumCover:
       (!track.hasUniqueCoverArt && track.album.hasCoverArt
diff --git a/src/content/dependencies/generateTrackInfoPage.js b/src/content/dependencies/generateTrackInfoPage.js
index bcae9748..df17d460 100644
--- a/src/content/dependencies/generateTrackInfoPage.js
+++ b/src/content/dependencies/generateTrackInfoPage.js
@@ -20,37 +20,6 @@ function checkInterrupted(which, relations, {html}) {
 }
 
 export default {
-  contentDependencies: [
-    'generateAdditionalFilesList',
-    'generateAdditionalNamesBox',
-    'generateAlbumArtworkColumn',
-    'generateAlbumNavAccent',
-    'generateAlbumSecondaryNav',
-    'generateAlbumSidebar',
-    'generateAlbumStyleTags',
-    'generateCommentaryEntry',
-    'generateCollapsedContentEntrySection',
-    'generateContentHeading',
-    'generateContributionList',
-    'generateLyricsSection',
-    'generatePageLayout',
-    'generateReadCommentaryLine',
-    'generateTrackArtistCommentarySection',
-    'generateTrackArtworkColumn',
-    'generateTrackInfoPageFeaturedByFlashesList',
-    'generateTrackInfoPageOtherReleasesList',
-    'generateTrackList',
-    'generateTrackListDividedByGroups',
-    'generateTrackNavLinks',
-    'generateTrackReleaseInfo',
-    'generateTrackSocialEmbed',
-    'linkAlbum',
-    'linkTrack',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   query: (track) => ({
     mainReleaseTrack:
       (track.isMainRelease
diff --git a/src/content/dependencies/generateTrackInfoPageFeaturedByFlashesList.js b/src/content/dependencies/generateTrackInfoPageFeaturedByFlashesList.js
index 61654512..cd7bb014 100644
--- a/src/content/dependencies/generateTrackInfoPageFeaturedByFlashesList.js
+++ b/src/content/dependencies/generateTrackInfoPageFeaturedByFlashesList.js
@@ -2,9 +2,6 @@ import {sortFlashesChronologically} from '#sort';
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['linkFlash', 'linkTrack'],
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({wikiInfo}) => ({
     enableFlashesAndGames:
       wikiInfo.enableFlashesAndGames,
diff --git a/src/content/dependencies/generateTrackInfoPageOtherReleasesList.js b/src/content/dependencies/generateTrackInfoPageOtherReleasesList.js
index 550c86b3..ca6c3fb7 100644
--- a/src/content/dependencies/generateTrackInfoPageOtherReleasesList.js
+++ b/src/content/dependencies/generateTrackInfoPageOtherReleasesList.js
@@ -1,9 +1,6 @@
 import {onlyItem, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['linkTrack'],
-  extraDependencies: ['html', 'language'],
-
   query(track) {
     const query = {};
 
diff --git a/src/content/dependencies/generateTrackList.js b/src/content/dependencies/generateTrackList.js
index ff7659b5..e30feb23 100644
--- a/src/content/dependencies/generateTrackList.js
+++ b/src/content/dependencies/generateTrackList.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateTrackListItem'],
-  extraDependencies: ['html'],
-
   query: (tracks, contextTrack) => ({
     presentedTracks:
       (contextTrack
diff --git a/src/content/dependencies/generateTrackListDividedByGroups.js b/src/content/dependencies/generateTrackListDividedByGroups.js
index 9deccc0c..d7342891 100644
--- a/src/content/dependencies/generateTrackListDividedByGroups.js
+++ b/src/content/dependencies/generateTrackListDividedByGroups.js
@@ -1,14 +1,6 @@
 import {empty, filterMultipleArrays, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateContentHeading',
-    'generateTrackList',
-    'linkGroup',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({wikiInfo}) => ({
     divideTrackListsByGroups:
       wikiInfo.divideTrackListsByGroups,
diff --git a/src/content/dependencies/generateTrackListItem.js b/src/content/dependencies/generateTrackListItem.js
index 4ec4a09a..9de9c3a6 100644
--- a/src/content/dependencies/generateTrackListItem.js
+++ b/src/content/dependencies/generateTrackListItem.js
@@ -1,13 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateArtistCredit',
-    'generateColorStyleAttribute',
-    'generateTrackListMissingDuration',
-    'linkTrack',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, track, contextContributions) => ({
     trackLink:
       relation('linkTrack', track),
diff --git a/src/content/dependencies/generateTrackListMissingDuration.js b/src/content/dependencies/generateTrackListMissingDuration.js
index b5917982..da3113a2 100644
--- a/src/content/dependencies/generateTrackListMissingDuration.js
+++ b/src/content/dependencies/generateTrackListMissingDuration.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateTextWithTooltip', 'generateTooltip'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation) => ({
     textWithTooltip:
       relation('generateTextWithTooltip'),
diff --git a/src/content/dependencies/generateTrackNavLinks.js b/src/content/dependencies/generateTrackNavLinks.js
index 8e4deaf5..d18e6cad 100644
--- a/src/content/dependencies/generateTrackNavLinks.js
+++ b/src/content/dependencies/generateTrackNavLinks.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkAlbum', 'linkTrack'],
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, track) => ({
     albumLink:
       relation('linkAlbum', track.album),
diff --git a/src/content/dependencies/generateTrackReferencedArtworksPage.js b/src/content/dependencies/generateTrackReferencedArtworksPage.js
index 7073409e..a2612067 100644
--- a/src/content/dependencies/generateTrackReferencedArtworksPage.js
+++ b/src/content/dependencies/generateTrackReferencedArtworksPage.js
@@ -1,13 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateAlbumStyleTags',
-    'generateBackToTrackLink',
-    'generateReferencedArtworksPage',
-    'generateTrackNavLinks',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, track) => ({
     page:
       relation('generateReferencedArtworksPage', track.trackArtworks[0]),
diff --git a/src/content/dependencies/generateTrackReferencingArtworksPage.js b/src/content/dependencies/generateTrackReferencingArtworksPage.js
index a45144c8..be13dd79 100644
--- a/src/content/dependencies/generateTrackReferencingArtworksPage.js
+++ b/src/content/dependencies/generateTrackReferencingArtworksPage.js
@@ -1,13 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateAlbumStyleTags',
-    'generateBackToTrackLink',
-    'generateReferencingArtworksPage',
-    'generateTrackNavLinks',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, track) => ({
     page:
       relation('generateReferencingArtworksPage', track.trackArtworks[0]),
diff --git a/src/content/dependencies/generateTrackReleaseBox.js b/src/content/dependencies/generateTrackReleaseBox.js
index ef02e2b9..c880fe63 100644
--- a/src/content/dependencies/generateTrackReleaseBox.js
+++ b/src/content/dependencies/generateTrackReleaseBox.js
@@ -1,12 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generatePageSidebarBox',
-    'linkTrack',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, track) => ({
     box:
       relation('generatePageSidebarBox'),
diff --git a/src/content/dependencies/generateTrackReleaseInfo.js b/src/content/dependencies/generateTrackReleaseInfo.js
index 45d47ecc..0207e574 100644
--- a/src/content/dependencies/generateTrackReleaseInfo.js
+++ b/src/content/dependencies/generateTrackReleaseInfo.js
@@ -1,14 +1,6 @@
 import {compareArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateReleaseInfoContributionsLine',
-    'generateReleaseInfoListenLine',
-    'linkAlbum',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations(relation, track) {
     const relations = {};
 
diff --git a/src/content/dependencies/generateTrackSocialEmbed.js b/src/content/dependencies/generateTrackSocialEmbed.js
index 310816f3..94453f7d 100644
--- a/src/content/dependencies/generateTrackSocialEmbed.js
+++ b/src/content/dependencies/generateTrackSocialEmbed.js
@@ -1,11 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateSocialEmbed',
-    'generateTrackSocialEmbedDescription',
-  ],
-
-  extraDependencies: ['absoluteTo', 'language'],
-
   relations(relation, track) {
     return {
       socialEmbed:
diff --git a/src/content/dependencies/generateTrackSocialEmbedDescription.js b/src/content/dependencies/generateTrackSocialEmbedDescription.js
index 4706aa26..97a4017f 100644
--- a/src/content/dependencies/generateTrackSocialEmbedDescription.js
+++ b/src/content/dependencies/generateTrackSocialEmbedDescription.js
@@ -1,8 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  extraDependencies: ['html', 'language'],
-
   data: (track) => ({
     artistNames:
       track.artistContribs
diff --git a/src/content/dependencies/generateUnsafeMunchy.js b/src/content/dependencies/generateUnsafeMunchy.js
index c11aadc7..df8231ef 100644
--- a/src/content/dependencies/generateUnsafeMunchy.js
+++ b/src/content/dependencies/generateUnsafeMunchy.js
@@ -1,6 +1,4 @@
 export default {
-  extraDependencies: ['html'],
-
   slots: {
     contentSource: {type: 'string'},
   },
diff --git a/src/content/dependencies/generateWallpaperStyleTag.js b/src/content/dependencies/generateWallpaperStyleTag.js
index bf094300..b89f01c2 100644
--- a/src/content/dependencies/generateWallpaperStyleTag.js
+++ b/src/content/dependencies/generateWallpaperStyleTag.js
@@ -1,9 +1,6 @@
 import {empty, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateStyleTag'],
-  extraDependencies: ['html', 'to'],
-
   relations: (relation) => ({
     styleTag:
       relation('generateStyleTag'),
diff --git a/src/content/dependencies/generateWikiHomepageActionsRow.js b/src/content/dependencies/generateWikiHomepageActionsRow.js
index 9f501099..5e3ff381 100644
--- a/src/content/dependencies/generateWikiHomepageActionsRow.js
+++ b/src/content/dependencies/generateWikiHomepageActionsRow.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['generateGridActionLinks', 'transformContent'],
-
   relations: (relation, row) => ({
     template:
       relation('generateGridActionLinks'),
diff --git a/src/content/dependencies/generateWikiHomepageAlbumCarouselRow.js b/src/content/dependencies/generateWikiHomepageAlbumCarouselRow.js
index b45bfc19..8f4b3400 100644
--- a/src/content/dependencies/generateWikiHomepageAlbumCarouselRow.js
+++ b/src/content/dependencies/generateWikiHomepageAlbumCarouselRow.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['generateCoverCarousel', 'image', 'linkAlbum'],
-
   relations: (relation, row) => ({
     coverCarousel:
       relation('generateCoverCarousel'),
diff --git a/src/content/dependencies/generateWikiHomepageAlbumGridRow.js b/src/content/dependencies/generateWikiHomepageAlbumGridRow.js
index a00136ba..6d167bdd 100644
--- a/src/content/dependencies/generateWikiHomepageAlbumGridRow.js
+++ b/src/content/dependencies/generateWikiHomepageAlbumGridRow.js
@@ -2,9 +2,6 @@ import {empty, stitchArrays} from '#sugar';
 import {getNewAdditions, getNewReleases} from '#wiki-data';
 
 export default {
-  contentDependencies: ['generateCoverGrid', 'image', 'linkAlbum'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({albumData}, row) {
     const sprawl = {};
 
diff --git a/src/content/dependencies/generateWikiHomepageNewsBox.js b/src/content/dependencies/generateWikiHomepageNewsBox.js
index 83a27695..3a06a7c3 100644
--- a/src/content/dependencies/generateWikiHomepageNewsBox.js
+++ b/src/content/dependencies/generateWikiHomepageNewsBox.js
@@ -1,14 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generatePageSidebarBox',
-    'linkNewsEntry',
-    'transformContent',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({newsData}) => ({
     entries:
       newsData.slice(0, 3),
diff --git a/src/content/dependencies/generateWikiHomepagePage.js b/src/content/dependencies/generateWikiHomepagePage.js
index 8c09a007..9029131b 100644
--- a/src/content/dependencies/generateWikiHomepagePage.js
+++ b/src/content/dependencies/generateWikiHomepagePage.js
@@ -1,15 +1,4 @@
 export default {
-  contentDependencies: [
-    'generatePageLayout',
-    'generatePageSidebar',
-    'generatePageSidebarBox',
-    'generateWikiHomepageNewsBox',
-    'generateWikiHomepageSection',
-    'transformContent',
-  ],
-
-  extraDependencies: ['wikiData'],
-
   sprawl: ({wikiInfo}) => ({
     wikiName:
       wikiInfo.name,
diff --git a/src/content/dependencies/generateWikiHomepageSection.js b/src/content/dependencies/generateWikiHomepageSection.js
index 49a474da..5fc0c76f 100644
--- a/src/content/dependencies/generateWikiHomepageSection.js
+++ b/src/content/dependencies/generateWikiHomepageSection.js
@@ -1,13 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generateWikiHomepageActionsRow',
-    'generateWikiHomepageAlbumCarouselRow',
-    'generateWikiHomepageAlbumGridRow',
-  ],
-
-  extraDependencies: ['html'],
-
   relations: (relation, homepageSection) => ({
     colorStyle:
       relation('generateColorStyleAttribute', homepageSection.color),
diff --git a/src/content/dependencies/generateWikiWallpaperStyleTag.js b/src/content/dependencies/generateWikiWallpaperStyleTag.js
index 12d27304..be52bcc1 100644
--- a/src/content/dependencies/generateWikiWallpaperStyleTag.js
+++ b/src/content/dependencies/generateWikiWallpaperStyleTag.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateWallpaperStyleTag'],
-  extraDependencies: ['wikiData'],
-
   sprawl: ({wikiInfo}) => ({wikiInfo}),
 
   relations: (relation) => ({
diff --git a/src/content/dependencies/image.js b/src/content/dependencies/image.js
index 2ffa4c48..1b6b08dd 100644
--- a/src/content/dependencies/image.js
+++ b/src/content/dependencies/image.js
@@ -2,20 +2,6 @@ import {logWarn} from '#cli';
 import {empty} from '#sugar';
 
 export default {
-  extraDependencies: [
-    'checkIfImagePathHasCachedThumbnails',
-    'getDimensionsOfImagePath',
-    'getSizeOfMediaFile',
-    'getThumbnailEqualOrSmaller',
-    'getThumbnailsAvailableForDimensions',
-    'html',
-    'language',
-    'missingImagePaths',
-    'to',
-  ],
-
-  contentDependencies: ['generateColorStyleAttribute'],
-
   relations: (relation, _artwork) => ({
     colorStyle:
       relation('generateColorStyleAttribute'),
diff --git a/src/content/dependencies/linkAdditionalFile.js b/src/content/dependencies/linkAdditionalFile.js
index a8a940b1..1b5e650f 100644
--- a/src/content/dependencies/linkAdditionalFile.js
+++ b/src/content/dependencies/linkAdditionalFile.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkTemplate'],
-
   query: (file, filename) => ({
     index:
       file.filenames.indexOf(filename),
diff --git a/src/content/dependencies/linkAlbum.js b/src/content/dependencies/linkAlbum.js
index f012369a..085d5f62 100644
--- a/src/content/dependencies/linkAlbum.js
+++ b/src/content/dependencies/linkAlbum.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkThing', 'linkTrack'],
-  extraDependencies: ['language'],
-
   relations: (relation, album) => ({
     link:
       (album.style === 'single'
diff --git a/src/content/dependencies/linkAlbumCommentary.js b/src/content/dependencies/linkAlbumCommentary.js
index ab519fd6..f1917345 100644
--- a/src/content/dependencies/linkAlbumCommentary.js
+++ b/src/content/dependencies/linkAlbumCommentary.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, album) =>
     ({link: relation('linkThing', 'localized.albumCommentary', album)}),
 
diff --git a/src/content/dependencies/linkAlbumDynamically.js b/src/content/dependencies/linkAlbumDynamically.js
index 45f8c2a9..ba572c8d 100644
--- a/src/content/dependencies/linkAlbumDynamically.js
+++ b/src/content/dependencies/linkAlbumDynamically.js
@@ -1,14 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'linkAlbumCommentary',
-    'linkAlbumGallery',
-    'linkAlbum',
-  ],
-
-  extraDependencies: ['html', 'pagePath'],
-
   relations: (relation, album) => ({
     galleryLink:
       relation('linkAlbumGallery', album),
diff --git a/src/content/dependencies/linkAlbumGallery.js b/src/content/dependencies/linkAlbumGallery.js
index e3f30a29..efba66d1 100644
--- a/src/content/dependencies/linkAlbumGallery.js
+++ b/src/content/dependencies/linkAlbumGallery.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, album) =>
     ({link: relation('linkThing', 'localized.albumGallery', album)}),
 
diff --git a/src/content/dependencies/linkAlbumReferencedArtworks.js b/src/content/dependencies/linkAlbumReferencedArtworks.js
index ba51b5e3..411bd2ab 100644
--- a/src/content/dependencies/linkAlbumReferencedArtworks.js
+++ b/src/content/dependencies/linkAlbumReferencedArtworks.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, album) =>
     ({link: relation('linkThing', 'localized.albumReferencedArtworks', album)}),
 
diff --git a/src/content/dependencies/linkAlbumReferencingArtworks.js b/src/content/dependencies/linkAlbumReferencingArtworks.js
index 4d5e799d..3aee9a4b 100644
--- a/src/content/dependencies/linkAlbumReferencingArtworks.js
+++ b/src/content/dependencies/linkAlbumReferencingArtworks.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, album) =>
     ({link: relation('linkThing', 'localized.albumReferencingArtworks', album)}),
 
diff --git a/src/content/dependencies/linkAnythingMan.js b/src/content/dependencies/linkAnythingMan.js
index 10ce7762..cb22baee 100644
--- a/src/content/dependencies/linkAnythingMan.js
+++ b/src/content/dependencies/linkAnythingMan.js
@@ -1,11 +1,4 @@
 export default {
-  contentDependencies: [
-    'linkAlbum',
-    'linkArtwork',
-    'linkFlash',
-    'linkTrack',
-  ],
-
   relations: (relation, thing) => ({
     link:
       (thing.isAlbum
diff --git a/src/content/dependencies/linkArtTagDynamically.js b/src/content/dependencies/linkArtTagDynamically.js
index 964258e1..4514b7c1 100644
--- a/src/content/dependencies/linkArtTagDynamically.js
+++ b/src/content/dependencies/linkArtTagDynamically.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkArtTagGallery', 'linkArtTagInfo'],
-  extraDependencies: ['pagePath'],
-
   relations: (relation, artTag) => ({
     galleryLink: relation('linkArtTagGallery', artTag),
     infoLink: relation('linkArtTagInfo', artTag),
diff --git a/src/content/dependencies/linkArtTagGallery.js b/src/content/dependencies/linkArtTagGallery.js
index a92b69c1..92ab1ed3 100644
--- a/src/content/dependencies/linkArtTagGallery.js
+++ b/src/content/dependencies/linkArtTagGallery.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, artTag) =>
     ({link: relation('linkThing', 'localized.artTagGallery', artTag)}),
 
diff --git a/src/content/dependencies/linkArtTagInfo.js b/src/content/dependencies/linkArtTagInfo.js
index 409cb3c0..5eb2ac56 100644
--- a/src/content/dependencies/linkArtTagInfo.js
+++ b/src/content/dependencies/linkArtTagInfo.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, artTag) =>
     ({link: relation('linkThing', 'localized.artTagInfo', artTag)}),
 
diff --git a/src/content/dependencies/linkArtist.js b/src/content/dependencies/linkArtist.js
index 718ee6fa..917ae6b6 100644
--- a/src/content/dependencies/linkArtist.js
+++ b/src/content/dependencies/linkArtist.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, artist) =>
     ({link: relation('linkThing', 'localized.artist', artist)}),
 
diff --git a/src/content/dependencies/linkArtistGallery.js b/src/content/dependencies/linkArtistGallery.js
index 66dc172d..001eec1f 100644
--- a/src/content/dependencies/linkArtistGallery.js
+++ b/src/content/dependencies/linkArtistGallery.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, artist) =>
     ({link: relation('linkThing', 'localized.artistGallery', artist)}),
 
diff --git a/src/content/dependencies/linkArtistRollingWindow.js b/src/content/dependencies/linkArtistRollingWindow.js
index e94b8ec5..6ab516ac 100644
--- a/src/content/dependencies/linkArtistRollingWindow.js
+++ b/src/content/dependencies/linkArtistRollingWindow.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, artist) =>
     ({link: relation('linkThing', 'localized.artistRollingWindow', artist)}),
 
diff --git a/src/content/dependencies/linkArtwork.js b/src/content/dependencies/linkArtwork.js
index c10150d1..fce89229 100644
--- a/src/content/dependencies/linkArtwork.js
+++ b/src/content/dependencies/linkArtwork.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkAlbum', 'linkTrack'],
-
   relations: (relation, artwork) => ({
     link:
       (artwork.thing.isAlbum
diff --git a/src/content/dependencies/linkCommentaryIndex.js b/src/content/dependencies/linkCommentaryIndex.js
index 5568ff84..e59b3641 100644
--- a/src/content/dependencies/linkCommentaryIndex.js
+++ b/src/content/dependencies/linkCommentaryIndex.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkStationaryIndex'],
-
   relations: (relation) =>
     ({link:
         relation(
diff --git a/src/content/dependencies/linkContribution.js b/src/content/dependencies/linkContribution.js
index 4ccaf7b4..aa9bdef9 100644
--- a/src/content/dependencies/linkContribution.js
+++ b/src/content/dependencies/linkContribution.js
@@ -1,12 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateContributionTooltip',
-    'generateTextWithTooltip',
-    'linkArtist',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, contribution) => ({
     artistLink:
       relation('linkArtist', contribution.artist),
diff --git a/src/content/dependencies/linkExternal.js b/src/content/dependencies/linkExternal.js
index 1614511e..ad8d4f23 100644
--- a/src/content/dependencies/linkExternal.js
+++ b/src/content/dependencies/linkExternal.js
@@ -1,8 +1,6 @@
 import {isExternalLinkContext, isExternalLinkStyle} from '#external-links';
 
 export default {
-  extraDependencies: ['html', 'language', 'to', 'wikiData'],
-
   sprawl: ({wikiInfo}) => ({
     canonicalBase:
       wikiInfo.canonicalBase,
diff --git a/src/content/dependencies/linkFlash.js b/src/content/dependencies/linkFlash.js
index 93dd5a28..cfc01079 100644
--- a/src/content/dependencies/linkFlash.js
+++ b/src/content/dependencies/linkFlash.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, flash) =>
     ({link: relation('linkThing', 'localized.flash', flash)}),
 
diff --git a/src/content/dependencies/linkFlashAct.js b/src/content/dependencies/linkFlashAct.js
index 82c23325..069bedf4 100644
--- a/src/content/dependencies/linkFlashAct.js
+++ b/src/content/dependencies/linkFlashAct.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['generateUnsafeMunchy', 'linkThing'],
-
   relations: (relation, flashAct) => ({
     unsafeMunchy:
       relation('generateUnsafeMunchy'),
diff --git a/src/content/dependencies/linkFlashIndex.js b/src/content/dependencies/linkFlashIndex.js
index 6dd0710e..9c1b076e 100644
--- a/src/content/dependencies/linkFlashIndex.js
+++ b/src/content/dependencies/linkFlashIndex.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkStationaryIndex'],
-
   relations: (relation) =>
     ({link:
         relation(
diff --git a/src/content/dependencies/linkFlashSide.js b/src/content/dependencies/linkFlashSide.js
index b77ca65a..6407ef25 100644
--- a/src/content/dependencies/linkFlashSide.js
+++ b/src/content/dependencies/linkFlashSide.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkFlashAct'],
-
   relations: (relation, flashSide) => ({
     link:
       relation('linkFlashAct', flashSide.acts[0]),
diff --git a/src/content/dependencies/linkGroup.js b/src/content/dependencies/linkGroup.js
index ebab1b5b..10bec2fb 100644
--- a/src/content/dependencies/linkGroup.js
+++ b/src/content/dependencies/linkGroup.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, group) =>
     ({link: relation('linkThing', 'localized.groupInfo', group)}),
 
diff --git a/src/content/dependencies/linkGroupDynamically.js b/src/content/dependencies/linkGroupDynamically.js
index 90303ed1..0b5bd85c 100644
--- a/src/content/dependencies/linkGroupDynamically.js
+++ b/src/content/dependencies/linkGroupDynamically.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkGroupGallery', 'linkGroup'],
-  extraDependencies: ['pagePath'],
-
   relations: (relation, group) => ({
     galleryLink: relation('linkGroupGallery', group),
     infoLink: relation('linkGroup', group),
diff --git a/src/content/dependencies/linkGroupExtra.js b/src/content/dependencies/linkGroupExtra.js
index bc3c0580..1a6161c1 100644
--- a/src/content/dependencies/linkGroupExtra.js
+++ b/src/content/dependencies/linkGroupExtra.js
@@ -1,13 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'linkGroup',
-    'linkGroupGallery',
-  ],
-
-  extraDependencies: ['html'],
-
   relations(relation, group) {
     const relations = {};
 
diff --git a/src/content/dependencies/linkGroupGallery.js b/src/content/dependencies/linkGroupGallery.js
index 86c4a0f3..957756d8 100644
--- a/src/content/dependencies/linkGroupGallery.js
+++ b/src/content/dependencies/linkGroupGallery.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, group) =>
     ({link: relation('linkThing', 'localized.groupGallery', group)}),
 
diff --git a/src/content/dependencies/linkListing.js b/src/content/dependencies/linkListing.js
index ac66919a..4eb2dce6 100644
--- a/src/content/dependencies/linkListing.js
+++ b/src/content/dependencies/linkListing.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-  extraDependencies: ['language'],
-
   relations: (relation, listing) =>
     ({link: relation('linkThing', 'localized.listing', listing)}),
 
diff --git a/src/content/dependencies/linkListingIndex.js b/src/content/dependencies/linkListingIndex.js
index 1bfaf46e..209066a9 100644
--- a/src/content/dependencies/linkListingIndex.js
+++ b/src/content/dependencies/linkListingIndex.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkStationaryIndex'],
-
   relations: (relation) =>
     ({link:
         relation(
diff --git a/src/content/dependencies/linkNewsEntry.js b/src/content/dependencies/linkNewsEntry.js
index 1fb32dd9..9ef7ac0e 100644
--- a/src/content/dependencies/linkNewsEntry.js
+++ b/src/content/dependencies/linkNewsEntry.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, newsEntry) =>
     ({link: relation('linkThing', 'localized.newsEntry', newsEntry)}),
 
diff --git a/src/content/dependencies/linkNewsIndex.js b/src/content/dependencies/linkNewsIndex.js
index e911a384..4414afc6 100644
--- a/src/content/dependencies/linkNewsIndex.js
+++ b/src/content/dependencies/linkNewsIndex.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkStationaryIndex'],
-
   relations: (relation) =>
     ({link:
         relation(
diff --git a/src/content/dependencies/linkOtherReleaseOnArtistInfoPage.js b/src/content/dependencies/linkOtherReleaseOnArtistInfoPage.js
index ec856631..5a16256e 100644
--- a/src/content/dependencies/linkOtherReleaseOnArtistInfoPage.js
+++ b/src/content/dependencies/linkOtherReleaseOnArtistInfoPage.js
@@ -3,9 +3,6 @@ import {sortAlbumsTracksChronologically, sortContributionsChronologically}
 import {chunkArtistTrackContributions} from '#wiki-data';
 
 export default {
-  contentDependencies: ['generateColorStyleAttribute'],
-  extraDependencies: ['html', 'language'],
-
   query(track, artist) {
     const relevantInfoPageChunkingContributions =
       track.allReleases
diff --git a/src/content/dependencies/linkPathFromMedia.js b/src/content/dependencies/linkPathFromMedia.js
index d71c69f8..344b7d2c 100644
--- a/src/content/dependencies/linkPathFromMedia.js
+++ b/src/content/dependencies/linkPathFromMedia.js
@@ -1,17 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: ['linkTemplate'],
-
-  extraDependencies: [
-    'checkIfImagePathHasCachedThumbnails',
-    'getDimensionsOfImagePath',
-    'getSizeOfMediaFile',
-    'getThumbnailsAvailableForDimensions',
-    'html',
-    'to',
-  ],
-
   relations: (relation) =>
     ({link: relation('linkTemplate')}),
 
diff --git a/src/content/dependencies/linkPathFromRoot.js b/src/content/dependencies/linkPathFromRoot.js
index dab3ac1f..b4a90c07 100644
--- a/src/content/dependencies/linkPathFromRoot.js
+++ b/src/content/dependencies/linkPathFromRoot.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkTemplate'],
-
   relations: (relation) =>
     ({link: relation('linkTemplate')}),
 
diff --git a/src/content/dependencies/linkPathFromSite.js b/src/content/dependencies/linkPathFromSite.js
index 64676465..67a43059 100644
--- a/src/content/dependencies/linkPathFromSite.js
+++ b/src/content/dependencies/linkPathFromSite.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkTemplate'],
-
   relations: (relation) =>
     ({link: relation('linkTemplate')}),
 
diff --git a/src/content/dependencies/linkReferencedArtworks.js b/src/content/dependencies/linkReferencedArtworks.js
index f73a2ad3..f8b3f3c8 100644
--- a/src/content/dependencies/linkReferencedArtworks.js
+++ b/src/content/dependencies/linkReferencedArtworks.js
@@ -1,9 +1,4 @@
 export default {
-  contentDependencies: [
-    'linkAlbumReferencedArtworks',
-    'linkTrackReferencedArtworks',
-  ],
-
   relations: (relation, artwork) => ({
     link:
       (artwork.thing.isAlbum
diff --git a/src/content/dependencies/linkReferencingArtworks.js b/src/content/dependencies/linkReferencingArtworks.js
index 6927f230..6b7e4f9a 100644
--- a/src/content/dependencies/linkReferencingArtworks.js
+++ b/src/content/dependencies/linkReferencingArtworks.js
@@ -1,9 +1,4 @@
 export default {
-  contentDependencies: [
-    'linkAlbumReferencingArtworks',
-    'linkTrackReferencingArtworks',
-  ],
-
   relations: (relation, artwork) => ({
     link:
       (artwork.thing.isAlbum
diff --git a/src/content/dependencies/linkStaticPage.js b/src/content/dependencies/linkStaticPage.js
index 032af6c9..c3ac69fa 100644
--- a/src/content/dependencies/linkStaticPage.js
+++ b/src/content/dependencies/linkStaticPage.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, staticPage) =>
     ({link: relation('linkThing', 'localized.staticPage', staticPage)}),
 
diff --git a/src/content/dependencies/linkStationaryIndex.js b/src/content/dependencies/linkStationaryIndex.js
index d5506e60..10f8ba44 100644
--- a/src/content/dependencies/linkStationaryIndex.js
+++ b/src/content/dependencies/linkStationaryIndex.js
@@ -1,9 +1,6 @@
 // Not to be confused with "html.Stationery".
 
 export default {
-  contentDependencies: ['linkTemplate'],
-  extraDependencies: ['language'],
-
   relations(relation) {
     return {
       linkTemplate: relation('linkTemplate'),
diff --git a/src/content/dependencies/linkTemplate.js b/src/content/dependencies/linkTemplate.js
index 4f853dc4..10466b43 100644
--- a/src/content/dependencies/linkTemplate.js
+++ b/src/content/dependencies/linkTemplate.js
@@ -3,13 +3,6 @@ import {empty} from '#sugar';
 import striptags from 'striptags';
 
 export default {
-  extraDependencies: [
-    'appendIndexHTML',
-    'html',
-    'language',
-    'to',
-  ],
-
   slots: {
     href: {type: 'string'},
     path: {validate: v => v.validateArrayItems(v.isString)},
diff --git a/src/content/dependencies/linkThing.js b/src/content/dependencies/linkThing.js
index 3902f380..7ee42980 100644
--- a/src/content/dependencies/linkThing.js
+++ b/src/content/dependencies/linkThing.js
@@ -1,13 +1,4 @@
 export default {
-  contentDependencies: [
-    'generateColorStyleAttribute',
-    'generateTextWithTooltip',
-    'generateTooltip',
-    'linkTemplate',
-  ],
-
-  extraDependencies: ['html', 'language'],
-
   relations: (relation, _pathKey, thing) => ({
     linkTemplate:
       relation('linkTemplate'),
diff --git a/src/content/dependencies/linkTrack.js b/src/content/dependencies/linkTrack.js
index d5d96726..8ee715f0 100644
--- a/src/content/dependencies/linkTrack.js
+++ b/src/content/dependencies/linkTrack.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, track) =>
     ({link: relation('linkThing', 'localized.track', track)}),
 
diff --git a/src/content/dependencies/linkTrackDynamically.js b/src/content/dependencies/linkTrackDynamically.js
index bbcf1c34..088bbe09 100644
--- a/src/content/dependencies/linkTrackDynamically.js
+++ b/src/content/dependencies/linkTrackDynamically.js
@@ -1,9 +1,6 @@
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: ['linkTrack'],
-  extraDependencies: ['pagePath'],
-
   relations: (relation, track) => ({
     infoLink: relation('linkTrack', track),
   }),
diff --git a/src/content/dependencies/linkTrackReferencedArtworks.js b/src/content/dependencies/linkTrackReferencedArtworks.js
index b4cb08fe..6da6504e 100644
--- a/src/content/dependencies/linkTrackReferencedArtworks.js
+++ b/src/content/dependencies/linkTrackReferencedArtworks.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, track) =>
     ({link: relation('linkThing', 'localized.trackReferencedArtworks', track)}),
 
diff --git a/src/content/dependencies/linkTrackReferencingArtworks.js b/src/content/dependencies/linkTrackReferencingArtworks.js
index c9c9f4d1..4d113ba7 100644
--- a/src/content/dependencies/linkTrackReferencingArtworks.js
+++ b/src/content/dependencies/linkTrackReferencingArtworks.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['linkThing'],
-
   relations: (relation, track) =>
     ({link: relation('linkThing', 'localized.trackReferencingArtworks', track)}),
 
diff --git a/src/content/dependencies/linkWikiHomepage.js b/src/content/dependencies/linkWikiHomepage.js
index d8d3d0a0..91fbe410 100644
--- a/src/content/dependencies/linkWikiHomepage.js
+++ b/src/content/dependencies/linkWikiHomepage.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['linkTemplate'],
-  extraDependencies: ['wikiData'],
-
   sprawl({wikiInfo}) {
     return {wikiShortName: wikiInfo.nameShort};
   },
diff --git a/src/content/dependencies/listAlbumsByDate.js b/src/content/dependencies/listAlbumsByDate.js
index c83ffc97..eaf9eecf 100644
--- a/src/content/dependencies/listAlbumsByDate.js
+++ b/src/content/dependencies/listAlbumsByDate.js
@@ -2,9 +2,6 @@ import {sortChronologically} from '#sort';
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkAlbum'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({albumData}) {
     return {albumData};
   },
diff --git a/src/content/dependencies/listAlbumsByDateAdded.js b/src/content/dependencies/listAlbumsByDateAdded.js
index d462ad46..940da67d 100644
--- a/src/content/dependencies/listAlbumsByDateAdded.js
+++ b/src/content/dependencies/listAlbumsByDateAdded.js
@@ -2,9 +2,6 @@ import {sortAlphabetically} from '#sort';
 import {chunkByProperties} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkAlbum'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({albumData}) {
     return {albumData};
   },
diff --git a/src/content/dependencies/listAlbumsByDuration.js b/src/content/dependencies/listAlbumsByDuration.js
index c28fd800..8de2bb84 100644
--- a/src/content/dependencies/listAlbumsByDuration.js
+++ b/src/content/dependencies/listAlbumsByDuration.js
@@ -3,9 +3,6 @@ import {filterByCount, stitchArrays} from '#sugar';
 import {getTotalDuration} from '#wiki-data';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkAlbum'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({albumData}) {
     return {albumData};
   },
diff --git a/src/content/dependencies/listAlbumsByName.js b/src/content/dependencies/listAlbumsByName.js
index 21419537..a7939292 100644
--- a/src/content/dependencies/listAlbumsByName.js
+++ b/src/content/dependencies/listAlbumsByName.js
@@ -2,9 +2,6 @@ import {sortAlphabetically} from '#sort';
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkAlbum'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({albumData}) {
     return {albumData};
   },
diff --git a/src/content/dependencies/listAlbumsByTracks.js b/src/content/dependencies/listAlbumsByTracks.js
index 1f20401c..b1f62a82 100644
--- a/src/content/dependencies/listAlbumsByTracks.js
+++ b/src/content/dependencies/listAlbumsByTracks.js
@@ -2,9 +2,6 @@ import {sortAlphabetically, sortByCount} from '#sort';
 import {filterByCount, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkAlbum'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({albumData}) {
     return {albumData};
   },
diff --git a/src/content/dependencies/listAllAdditionalFiles.js b/src/content/dependencies/listAllAdditionalFiles.js
index a6e34b9a..2d338916 100644
--- a/src/content/dependencies/listAllAdditionalFiles.js
+++ b/src/content/dependencies/listAllAdditionalFiles.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['listAllAdditionalFilesTemplate'],
-
   relations: (relation, spec) =>
     ({page: relation('listAllAdditionalFilesTemplate', spec, 'additionalFiles')}),
 
diff --git a/src/content/dependencies/listAllAdditionalFilesTemplate.js b/src/content/dependencies/listAllAdditionalFilesTemplate.js
index 8ec69f1d..f298233c 100644
--- a/src/content/dependencies/listAllAdditionalFilesTemplate.js
+++ b/src/content/dependencies/listAllAdditionalFilesTemplate.js
@@ -1,13 +1,6 @@
 import {sortChronologically} from '#sort';
 
 export default {
-  contentDependencies: [
-    'generateListingPage',
-    'generateListAllAdditionalFilesAlbumSection',
-  ],
-
-  extraDependencies: ['html', 'wikiData'],
-
   sprawl: ({albumData}) => ({albumData}),
 
   query: (sprawl, spec, property) => ({
diff --git a/src/content/dependencies/listAllMidiProjectFiles.js b/src/content/dependencies/listAllMidiProjectFiles.js
index 31a70ef0..109cf2e7 100644
--- a/src/content/dependencies/listAllMidiProjectFiles.js
+++ b/src/content/dependencies/listAllMidiProjectFiles.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['listAllAdditionalFilesTemplate'],
-
   relations: (relation, spec) =>
     ({page: relation('listAllAdditionalFilesTemplate', spec, 'midiProjectFiles')}),
 
diff --git a/src/content/dependencies/listAllSheetMusicFiles.js b/src/content/dependencies/listAllSheetMusicFiles.js
index 166b2068..4f3bdb96 100644
--- a/src/content/dependencies/listAllSheetMusicFiles.js
+++ b/src/content/dependencies/listAllSheetMusicFiles.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['listAllAdditionalFilesTemplate'],
-
   relations: (relation, spec) =>
     ({page: relation('listAllAdditionalFilesTemplate', spec, 'sheetMusicFiles')}),
 
diff --git a/src/content/dependencies/listArtTagNetwork.js b/src/content/dependencies/listArtTagNetwork.js
index 93dd4ce8..98f81019 100644
--- a/src/content/dependencies/listArtTagNetwork.js
+++ b/src/content/dependencies/listArtTagNetwork.js
@@ -2,9 +2,6 @@ import {sortAlphabetically} from '#sort';
 import {empty, stitchArrays, unique} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkArtTagInfo'],
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl({artTagData}) {
     return {artTagData};
   },
diff --git a/src/content/dependencies/listArtTagsByName.js b/src/content/dependencies/listArtTagsByName.js
index 1df9dfff..10e9e873 100644
--- a/src/content/dependencies/listArtTagsByName.js
+++ b/src/content/dependencies/listArtTagsByName.js
@@ -2,9 +2,6 @@ import {sortAlphabetically} from '#sort';
 import {stitchArrays, unique} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkArtTagGallery'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({artTagData}) {
     return {artTagData};
   },
diff --git a/src/content/dependencies/listArtTagsByUses.js b/src/content/dependencies/listArtTagsByUses.js
index eca7f1c6..5131580f 100644
--- a/src/content/dependencies/listArtTagsByUses.js
+++ b/src/content/dependencies/listArtTagsByUses.js
@@ -2,9 +2,6 @@ import {sortAlphabetically, sortByCount} from '#sort';
 import {filterByCount, stitchArrays, unique} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkArtTagGallery'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl: ({artTagData}) =>
     ({artTagData}),
 
diff --git a/src/content/dependencies/listArtistsByCommentaryEntries.js b/src/content/dependencies/listArtistsByCommentaryEntries.js
index eff2dba3..ab7bde6c 100644
--- a/src/content/dependencies/listArtistsByCommentaryEntries.js
+++ b/src/content/dependencies/listArtistsByCommentaryEntries.js
@@ -2,9 +2,6 @@ import {sortAlphabetically, sortByCount} from '#sort';
 import {filterByCount, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkArtist'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({artistData}) {
     return {artistData};
   },
diff --git a/src/content/dependencies/listArtistsByContributions.js b/src/content/dependencies/listArtistsByContributions.js
index 99f19764..2f8d6391 100644
--- a/src/content/dependencies/listArtistsByContributions.js
+++ b/src/content/dependencies/listArtistsByContributions.js
@@ -3,9 +3,6 @@ import {empty, filterByCount, filterMultipleArrays, stitchArrays}
   from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkArtist'],
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl({artistData, wikiInfo}) {
     return {
       artistData,
diff --git a/src/content/dependencies/listArtistsByDuration.js b/src/content/dependencies/listArtistsByDuration.js
index 6b2a18a0..1d550b26 100644
--- a/src/content/dependencies/listArtistsByDuration.js
+++ b/src/content/dependencies/listArtistsByDuration.js
@@ -2,9 +2,6 @@ import {sortAlphabetically, sortByCount} from '#sort';
 import {filterByCount, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkArtist'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({artistData}) {
     return {artistData};
   },
diff --git a/src/content/dependencies/listArtistsByGroup.js b/src/content/dependencies/listArtistsByGroup.js
index 17096cfc..44564b4b 100644
--- a/src/content/dependencies/listArtistsByGroup.js
+++ b/src/content/dependencies/listArtistsByGroup.js
@@ -10,9 +10,6 @@ import {
 } from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkArtist', 'linkGroup'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({artistData, wikiInfo}) {
     return {artistData, wikiInfo};
   },
diff --git a/src/content/dependencies/listArtistsByLatestContribution.js b/src/content/dependencies/listArtistsByLatestContribution.js
index 2a8d1b4c..dc7341cf 100644
--- a/src/content/dependencies/listArtistsByLatestContribution.js
+++ b/src/content/dependencies/listArtistsByLatestContribution.js
@@ -11,15 +11,6 @@ import {
 const {Album, Flash} = T;
 
 export default {
-  contentDependencies: [
-    'generateListingPage',
-    'linkAlbum',
-    'linkArtist',
-    'linkFlash',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({albumData, artistData, flashData, trackData, wikiInfo}) =>
     ({albumData, artistData, flashData, trackData,
       enableFlashesAndGames: wikiInfo.enableFlashesAndGames}),
diff --git a/src/content/dependencies/listArtistsByName.js b/src/content/dependencies/listArtistsByName.js
index 93218492..8bee4947 100644
--- a/src/content/dependencies/listArtistsByName.js
+++ b/src/content/dependencies/listArtistsByName.js
@@ -3,9 +3,6 @@ import {stitchArrays} from '#sugar';
 import {getArtistNumContributions} from '#wiki-data';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkArtist', 'linkGroup'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl: ({artistData, wikiInfo}) =>
     ({artistData, wikiInfo}),
 
diff --git a/src/content/dependencies/listGroupsByAlbums.js b/src/content/dependencies/listGroupsByAlbums.js
index 4adfb6d9..64814640 100644
--- a/src/content/dependencies/listGroupsByAlbums.js
+++ b/src/content/dependencies/listGroupsByAlbums.js
@@ -2,9 +2,6 @@ import {sortAlphabetically, sortByCount} from '#sort';
 import {filterByCount, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkGroup'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({groupData}) {
     return {groupData};
   },
diff --git a/src/content/dependencies/listGroupsByCategory.js b/src/content/dependencies/listGroupsByCategory.js
index 43919bef..4c10a1e4 100644
--- a/src/content/dependencies/listGroupsByCategory.js
+++ b/src/content/dependencies/listGroupsByCategory.js
@@ -1,9 +1,6 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkGroup', 'linkGroupGallery'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({groupCategoryData}) {
     return {groupCategoryData};
   },
diff --git a/src/content/dependencies/listGroupsByDuration.js b/src/content/dependencies/listGroupsByDuration.js
index c79e1bc4..089915c2 100644
--- a/src/content/dependencies/listGroupsByDuration.js
+++ b/src/content/dependencies/listGroupsByDuration.js
@@ -3,9 +3,6 @@ import {filterByCount, stitchArrays} from '#sugar';
 import {getTotalDuration} from '#wiki-data';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkGroup'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({groupData}) {
     return {groupData};
   },
diff --git a/src/content/dependencies/listGroupsByLatestAlbum.js b/src/content/dependencies/listGroupsByLatestAlbum.js
index 48319314..2d83a354 100644
--- a/src/content/dependencies/listGroupsByLatestAlbum.js
+++ b/src/content/dependencies/listGroupsByLatestAlbum.js
@@ -2,15 +2,6 @@ import {compareDates, sortChronologically} from '#sort';
 import {filterMultipleArrays, sortMultipleArrays, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateListingPage',
-    'linkAlbum',
-    'linkGroup',
-    'linkGroupGallery',
-  ],
-
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({groupData}) {
     return {groupData};
   },
diff --git a/src/content/dependencies/listGroupsByName.js b/src/content/dependencies/listGroupsByName.js
index 696a49bd..e3308158 100644
--- a/src/content/dependencies/listGroupsByName.js
+++ b/src/content/dependencies/listGroupsByName.js
@@ -2,9 +2,6 @@ import {sortAlphabetically} from '#sort';
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkGroup', 'linkGroupGallery'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({groupData}) {
     return {groupData};
   },
diff --git a/src/content/dependencies/listGroupsByTracks.js b/src/content/dependencies/listGroupsByTracks.js
index 0b5e4e97..c9d97614 100644
--- a/src/content/dependencies/listGroupsByTracks.js
+++ b/src/content/dependencies/listGroupsByTracks.js
@@ -2,9 +2,6 @@ import {sortAlphabetically, sortByCount} from '#sort';
 import {accumulateSum, filterByCount, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkGroup'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({groupData}) {
     return {groupData};
   },
diff --git a/src/content/dependencies/listRandomPageLinks.js b/src/content/dependencies/listRandomPageLinks.js
index 79bba441..81eca274 100644
--- a/src/content/dependencies/listRandomPageLinks.js
+++ b/src/content/dependencies/listRandomPageLinks.js
@@ -2,14 +2,6 @@ import {sortChronologically} from '#sort';
 import {empty} from '#sugar';
 
 export default {
-  contentDependencies: [
-    'generateListingPage',
-    'generateListRandomPageLinksAlbumLink',
-    'linkGroup',
-  ],
-
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl: ({albumData, wikiInfo}) => ({albumData, wikiInfo}),
 
   query(sprawl, spec) {
diff --git a/src/content/dependencies/listTracksByAlbum.js b/src/content/dependencies/listTracksByAlbum.js
index b2405034..f6858ada 100644
--- a/src/content/dependencies/listTracksByAlbum.js
+++ b/src/content/dependencies/listTracksByAlbum.js
@@ -1,7 +1,4 @@
 export default {
-  contentDependencies: ['generateListingPage', 'linkAlbum', 'linkTrack'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({albumData}) {
     return {albumData};
   },
diff --git a/src/content/dependencies/listTracksByDate.js b/src/content/dependencies/listTracksByDate.js
index dcfaeaf0..9d63f19b 100644
--- a/src/content/dependencies/listTracksByDate.js
+++ b/src/content/dependencies/listTracksByDate.js
@@ -2,9 +2,6 @@ import {sortAlbumsTracksChronologically} from '#sort';
 import {chunkByProperties, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkAlbum', 'linkTrack'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl: ({trackData}) => ({trackData}),
 
   query({trackData}, spec) {
diff --git a/src/content/dependencies/listTracksByDuration.js b/src/content/dependencies/listTracksByDuration.js
index 64feb4f1..95fd28b2 100644
--- a/src/content/dependencies/listTracksByDuration.js
+++ b/src/content/dependencies/listTracksByDuration.js
@@ -2,9 +2,6 @@ import {sortAlphabetically, sortByCount} from '#sort';
 import {filterByCount, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkTrack'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({trackData}) {
     return {trackData};
   },
diff --git a/src/content/dependencies/listTracksByDurationInAlbum.js b/src/content/dependencies/listTracksByDurationInAlbum.js
index c1ea32a1..ad44c7b2 100644
--- a/src/content/dependencies/listTracksByDurationInAlbum.js
+++ b/src/content/dependencies/listTracksByDurationInAlbum.js
@@ -2,9 +2,6 @@ import {sortByCount, sortChronologically} from '#sort';
 import {filterByCount, filterMultipleArrays, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkAlbum', 'linkTrack'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({albumData}) {
     return {albumData};
   },
diff --git a/src/content/dependencies/listTracksByName.js b/src/content/dependencies/listTracksByName.js
index 773b0473..a9c2c504 100644
--- a/src/content/dependencies/listTracksByName.js
+++ b/src/content/dependencies/listTracksByName.js
@@ -1,9 +1,6 @@
 import {sortAlphabetically} from '#sort';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkTrack'],
-  extraDependencies: ['wikiData'],
-
   sprawl({trackData}) {
     return {trackData};
   },
diff --git a/src/content/dependencies/listTracksByTimesReferenced.js b/src/content/dependencies/listTracksByTimesReferenced.js
index 5838ded0..8a57e1a6 100644
--- a/src/content/dependencies/listTracksByTimesReferenced.js
+++ b/src/content/dependencies/listTracksByTimesReferenced.js
@@ -2,9 +2,6 @@ import {sortAlbumsTracksChronologically, sortByCount} from '#sort';
 import {filterByCount, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkTrack'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({trackData}) {
     return {trackData};
   },
diff --git a/src/content/dependencies/listTracksInFlashesByAlbum.js b/src/content/dependencies/listTracksInFlashesByAlbum.js
index 8ca0d993..db5472db 100644
--- a/src/content/dependencies/listTracksInFlashesByAlbum.js
+++ b/src/content/dependencies/listTracksInFlashesByAlbum.js
@@ -2,9 +2,6 @@ import {sortChronologically} from '#sort';
 import {empty, filterMultipleArrays, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkAlbum', 'linkFlash', 'linkTrack'],
-  extraDependencies: ['language', 'wikiData'],
-
   sprawl({albumData}) {
     return {albumData};
   },
diff --git a/src/content/dependencies/listTracksInFlashesByFlash.js b/src/content/dependencies/listTracksInFlashesByFlash.js
index 6ab954ed..325b3cb5 100644
--- a/src/content/dependencies/listTracksInFlashesByFlash.js
+++ b/src/content/dependencies/listTracksInFlashesByFlash.js
@@ -2,9 +2,6 @@ import {sortFlashesChronologically} from '#sort';
 import {empty, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkAlbum', 'linkFlash', 'linkTrack'],
-  extraDependencies: ['wikiData'],
-
   sprawl({flashData}) {
     return {flashData};
   },
diff --git a/src/content/dependencies/listTracksNeedingLyrics.js b/src/content/dependencies/listTracksNeedingLyrics.js
index 655bf2a0..d21fcd06 100644
--- a/src/content/dependencies/listTracksNeedingLyrics.js
+++ b/src/content/dependencies/listTracksNeedingLyrics.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['listTracksWithExtra'],
-
   relations: (relation, spec) =>
     ({page: relation('listTracksWithExtra', spec, 'needsLyrics', 'truthy')}),
 
diff --git a/src/content/dependencies/listTracksWithExtra.js b/src/content/dependencies/listTracksWithExtra.js
index c7f42f9d..09d8ee21 100644
--- a/src/content/dependencies/listTracksWithExtra.js
+++ b/src/content/dependencies/listTracksWithExtra.js
@@ -2,9 +2,6 @@ import {sortChronologically} from '#sort';
 import {empty, filterMultipleArrays, stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['generateListingPage', 'linkAlbum', 'linkTrack'],
-  extraDependencies: ['html', 'language', 'wikiData'],
-
   sprawl({albumData}) {
     return {albumData};
   },
diff --git a/src/content/dependencies/listTracksWithLyrics.js b/src/content/dependencies/listTracksWithLyrics.js
index e6ab9d7d..79d76bf3 100644
--- a/src/content/dependencies/listTracksWithLyrics.js
+++ b/src/content/dependencies/listTracksWithLyrics.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['listTracksWithExtra'],
-
   relations: (relation, spec) =>
     ({page: relation('listTracksWithExtra', spec, 'lyrics', 'array')}),
 
diff --git a/src/content/dependencies/listTracksWithMidiProjectFiles.js b/src/content/dependencies/listTracksWithMidiProjectFiles.js
index 418af4c2..9a48f6ae 100644
--- a/src/content/dependencies/listTracksWithMidiProjectFiles.js
+++ b/src/content/dependencies/listTracksWithMidiProjectFiles.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['listTracksWithExtra'],
-
   relations: (relation, spec) =>
     ({page: relation('listTracksWithExtra', spec, 'midiProjectFiles', 'array')}),
 
diff --git a/src/content/dependencies/listTracksWithSheetMusicFiles.js b/src/content/dependencies/listTracksWithSheetMusicFiles.js
index 0c6761eb..f0ba4196 100644
--- a/src/content/dependencies/listTracksWithSheetMusicFiles.js
+++ b/src/content/dependencies/listTracksWithSheetMusicFiles.js
@@ -1,6 +1,4 @@
 export default {
-  contentDependencies: ['listTracksWithExtra'],
-
   relations: (relation, spec) =>
     ({page: relation('listTracksWithExtra', spec, 'sheetMusicFiles', 'array')}),
 
diff --git a/src/content/dependencies/transformContent.js b/src/content/dependencies/transformContent.js
index a3df46cd..73452cfa 100644
--- a/src/content/dependencies/transformContent.js
+++ b/src/content/dependencies/transformContent.js
@@ -58,26 +58,6 @@ function getArg(node, argKey) {
 }
 
 export default {
-  contentDependencies: [
-    ...(
-      Object.values(replacerSpec)
-        .map(description => description.link)
-        .filter(Boolean)),
-
-    'image',
-    'generateTextWithTooltip',
-    'generateTooltip',
-    'linkExternal',
-  ],
-
-  extraDependencies: [
-    'html',
-    'language',
-    'niceShowAggregate',
-    'to',
-    'wikiData',
-  ],
-
   sprawl(wikiData, content) {
     const find =
       bindFind(wikiData, {