diff --git a/testfiles/sectionpages.lvt b/testfiles/sectionpages.lvt
index b6de7cf..e95ff43 100644
--- a/testfiles/sectionpages.lvt
+++ b/testfiles/sectionpages.lvt
@@ -1,4 +1,4 @@
-\documentclass{beamer}
+\documentclass[hyperref={draft}]{beamer}
 \usetheme{moloch}
 \usepackage{lmodern}
 \input{sectionpages}
diff --git a/testfiles/sectionpages.tlg b/testfiles/sectionpages.tlg
index 6dfc698..ab41a29 100644
--- a/testfiles/sectionpages.tlg
+++ b/testfiles/sectionpages.tlg
@@ -20,10 +20,6 @@ Completed box being shipped out [2]
 ...\kern 0.0
 ...\kern -43.81725
 ...\kern -1.00374
-...\pdfdest name{Navigation2} xyz
-...\penalty 10000
-...\pdfdest name{page.2} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -284,10 +280,6 @@ Completed box being shipped out [3]
 ...\kern 0.0
 ...\kern -43.81725
 ...\kern -1.00374
-...\pdfdest name{Navigation3} xyz
-...\penalty 10000
-...\pdfdest name{page.3} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -336,8 +328,6 @@ Completed box being shipped out [3]
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@sectionpages {1}{2}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionpages {1}{2}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \sectionentry {1}{Section}{3}{Section}{0}}}}
-....\write5{\protect \BOOKMARK [2][]{Outline0.1}{\376\377\000S\000e\000c\000t\000i\000o\000n}{}% 1}
-....\pdfdest name{Outline0.1} xyz
 ....\glue(\topskip) 0.0
 ....\vbox(261.20912+0.0)x307.28987, glue set 117.97325fil
 .....\penalty 10000
@@ -368,7 +358,6 @@ Completed box being shipped out [3]
 .......\glue(\parskip) 0.0
 .......\hbox(10.00008+0.0)x241.99265, glue set 96.64658fil
 ........\hbox(0.0+0.0)x0.0
-........\pdfstartlink(*+*)x* attr{/Border[0 0 0]/H/N/C[.5 .5 .5]} action goto name{Navigation3}
 ........\OT1/lmss/bx/n/14.4 S
 ........\OT1/lmss/bx/n/14.4 e
 ........\OT1/lmss/bx/n/14.4 c
@@ -376,7 +365,6 @@ Completed box being shipped out [3]
 ........\OT1/lmss/bx/n/14.4 i
 ........\OT1/lmss/bx/n/14.4 o
 ........\OT1/lmss/bx/n/14.4 n
-........\pdfendlink
 ........\penalty 10000
 ........\glue(\parfillskip) 0.0 plus 1.0fil
 ........\glue(\rightskip) 0.0 plus 1.0fil
@@ -497,10 +485,6 @@ Completed box being shipped out [4]
 ...\kern 0.0
 ...\kern -43.81725
 ...\kern -1.00374
-...\pdfdest name{Navigation4} xyz
-...\penalty 10000
-...\pdfdest name{page.4} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -548,8 +532,6 @@ Completed box being shipped out [4]
 ....\write1{\@writefile{toc}{\protect \beamer@subsectionintoc {1}{1}{Subsection}{4}{0}{1}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionpages {3}{3}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionentry {0}{1}{1}{4}{Subsection}}}}
-....\write5{\protect \BOOKMARK [3][]{Outline0.1.1.4}{\376\377\000S\000u\000b\000s\000e\000c\000t\000i\000o\000n}{Outline0.1}% 2}
-....\pdfdest name{Outline0.1.1.4} xyz
 ....\glue(\topskip) 0.0
 ....\vbox(261.20912+0.0)x307.28987, glue set 117.97325fil
 .....\penalty 10000
@@ -581,7 +563,6 @@ Completed box being shipped out [4]
 .......\glue(\parskip) 0.0
 .......\hbox(10.00008+0.0)x241.99265, glue set 96.64658fil
 ........\hbox(0.0+0.0)x0.0
-........\pdfstartlink(*+*)x* attr{/Border[0 0 0]/H/N/C[.5 .5 .5]} action goto name{Navigation3}
 ........\OT1/lmss/bx/n/14.4 S
 ........\OT1/lmss/bx/n/14.4 e
 ........\OT1/lmss/bx/n/14.4 c
@@ -589,7 +570,6 @@ Completed box being shipped out [4]
 ........\OT1/lmss/bx/n/14.4 i
 ........\OT1/lmss/bx/n/14.4 o
 ........\OT1/lmss/bx/n/14.4 n
-........\pdfendlink
 ........\penalty 10000
 ........\glue(\parfillskip) 0.0 plus 1.0fil
 ........\glue(\rightskip) 0.0 plus 1.0fil
@@ -655,7 +635,6 @@ Completed box being shipped out [4]
 .......\hbox(9.79996+4.20004)x241.99265, glue set 91.44168fil
 ........\hbox(0.0+0.0)x0.0
 ........\rule(9.79996+4.20004)x0.0
-........\pdfstartlink(*+*)x* attr{/Border[0 0 0]/H/N/C[.5 .5 .5]} action goto name{Navigation4}
 ........\OT1/lmss/bx/n/12 S
 ........\OT1/lmss/bx/n/12 u
 ........\OT1/lmss/bx/n/12 b
@@ -666,7 +645,6 @@ Completed box being shipped out [4]
 ........\OT1/lmss/bx/n/12 i
 ........\OT1/lmss/bx/n/12 o
 ........\OT1/lmss/bx/n/12 n
-........\pdfendlink
 ........\penalty 10000
 ........\glue(\parfillskip) 0.0 plus 1.0fil
 ........\glue(\rightskip) 0.0 plus 1.0fil
@@ -723,10 +701,6 @@ Completed box being shipped out [5]
 ...\kern 0.0
 ...\kern -43.81725
 ...\kern -1.00374
-...\pdfdest name{Navigation5} xyz
-...\penalty 10000
-...\pdfdest name{page.5} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -963,10 +937,6 @@ Completed box being shipped out [6]
 ...\kern 0.0
 ...\kern -43.81725
 ...\kern -1.00374
-...\pdfdest name{Navigation6} xyz
-...\penalty 10000
-...\pdfdest name{page.6} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -1015,8 +985,6 @@ Completed box being shipped out [6]
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@sectionpages {3}{5}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionpages {4}{5}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \sectionentry {2}{Section}{6}{Section}{0}}}}
-....\write5{\protect \BOOKMARK [2][]{Outline0.2}{\376\377\000S\000e\000c\000t\000i\000o\000n}{}% 3}
-....\pdfdest name{Outline0.2} xyz
 ....\glue(\topskip) 0.0
 ....\vbox(261.20912+0.0)x307.28987, glue set 117.97325fil
 .....\penalty 10000
@@ -1047,7 +1015,6 @@ Completed box being shipped out [6]
 .......\glue(\parskip) 0.0
 .......\hbox(10.00008+0.0)x241.99265, glue set 96.64658fil
 ........\hbox(0.0+0.0)x0.0
-........\pdfstartlink(*+*)x* attr{/Border[0 0 0]/H/N/C[.5 .5 .5]} action goto name{Navigation6}
 ........\OT1/lmss/bx/n/14.4 S
 ........\OT1/lmss/bx/n/14.4 e
 ........\OT1/lmss/bx/n/14.4 c
@@ -1055,7 +1022,6 @@ Completed box being shipped out [6]
 ........\OT1/lmss/bx/n/14.4 i
 ........\OT1/lmss/bx/n/14.4 o
 ........\OT1/lmss/bx/n/14.4 n
-........\pdfendlink
 ........\penalty 10000
 ........\glue(\parfillskip) 0.0 plus 1.0fil
 ........\glue(\rightskip) 0.0 plus 1.0fil
@@ -1176,10 +1142,6 @@ Completed box being shipped out [7]
 ...\kern 0.0
 ...\kern -43.81725
 ...\kern -1.00374
-...\pdfdest name{Navigation7} xyz
-...\penalty 10000
-...\pdfdest name{page.7} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -1227,8 +1189,6 @@ Completed box being shipped out [7]
 ....\write1{\@writefile{toc}{\protect \beamer@subsectionintoc {2}{1}{Subsection}{7}{0}{2}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionpages {6}{6}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionentry {0}{2}{1}{7}{Subsection}}}}
-....\write5{\protect \BOOKMARK [3][]{Outline0.2.1.7}{\376\377\000S\000u\000b\000s\000e\000c\000t\000i\000o\000n}{Outline0.2}% 4}
-....\pdfdest name{Outline0.2.1.7} xyz
 ....\glue(\topskip) 0.0
 ....\vbox(261.20912+0.0)x307.28987, glue set 108.90662fil
 .....\penalty 10000
@@ -1264,7 +1224,6 @@ Completed box being shipped out [7]
 ........\pdfcolorstack 0 pop
 .......\glue 5.475
 ......\penalty 0
-......\pdfstartlink(*+*)x* attr{/Border[0 0 0]/H/N/C[.5 .5 .5]} action goto name{Navigation6}
 ......\OT1/lmss/bx/n/14.4 S
 ......\OT1/lmss/bx/n/14.4 e
 ......\OT1/lmss/bx/n/14.4 c
@@ -1272,7 +1231,6 @@ Completed box being shipped out [7]
 ......\OT1/lmss/bx/n/14.4 i
 ......\OT1/lmss/bx/n/14.4 o
 ......\OT1/lmss/bx/n/14.4 n
-......\pdfendlink
 ......\penalty 10000
 ......\glue(\parfillskip) 0.0
 ......\glue(\rightskip) 0.0 plus 1.0fil
@@ -1284,7 +1242,6 @@ Completed box being shipped out [7]
 ......\glue(\leftskip) 0.0 plus 1.0fil
 ......\hbox(0.0+0.0)x0.0
 ......\rule(9.79996+4.20004)x0.0
-......\pdfstartlink(*+*)x* attr{/Border[0 0 0]/H/N/C[.5 .5 .5]} action goto name{Navigation7}
 ......\OT1/lmss/bx/n/12 S
 ......\OT1/lmss/bx/n/12 u
 ......\OT1/lmss/bx/n/12 b
@@ -1295,7 +1252,6 @@ Completed box being shipped out [7]
 ......\OT1/lmss/bx/n/12 i
 ......\OT1/lmss/bx/n/12 o
 ......\OT1/lmss/bx/n/12 n
-......\pdfendlink
 ......\penalty 10000
 ......\glue(\parfillskip) 0.0
 ......\glue(\rightskip) 0.0 plus 1.0fil
@@ -1352,10 +1308,6 @@ Completed box being shipped out [8]
 ...\kern 0.0
 ...\kern -43.81725
 ...\kern -1.00374
-...\pdfdest name{Navigation8} xyz
-...\penalty 10000
-...\pdfdest name{page.8} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -1404,8 +1356,6 @@ Completed box being shipped out [8]
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@sectionpages {6}{7}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionpages {7}{7}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \sectionentry {3}{Section}{8}{Section}{0}}}}
-....\write5{\protect \BOOKMARK [2][]{Outline0.3}{\376\377\000S\000e\000c\000t\000i\000o\000n}{}% 5}
-....\pdfdest name{Outline0.3} xyz
 ....\glue(\topskip) 0.0
 ....\vbox(261.20912+0.0)x307.28987, glue set 117.97325fil
 .....\penalty 10000
@@ -1436,7 +1386,6 @@ Completed box being shipped out [8]
 .......\glue(\parskip) 0.0
 .......\hbox(10.00008+0.0)x241.99265, glue set 96.64658fil
 ........\hbox(0.0+0.0)x0.0
-........\pdfstartlink(*+*)x* attr{/Border[0 0 0]/H/N/C[.5 .5 .5]} action goto name{Navigation8}
 ........\OT1/lmss/bx/n/14.4 S
 ........\OT1/lmss/bx/n/14.4 e
 ........\OT1/lmss/bx/n/14.4 c
@@ -1444,7 +1393,6 @@ Completed box being shipped out [8]
 ........\OT1/lmss/bx/n/14.4 i
 ........\OT1/lmss/bx/n/14.4 o
 ........\OT1/lmss/bx/n/14.4 n
-........\pdfendlink
 ........\penalty 10000
 ........\glue(\parfillskip) 0.0 plus 1.0fil
 ........\glue(\rightskip) 0.0 plus 1.0fil
@@ -1565,10 +1513,6 @@ Completed box being shipped out [9]
 ...\kern 0.0
 ...\kern -43.81725
 ...\kern -1.00374
-...\pdfdest name{Navigation9} xyz
-...\penalty 10000
-...\pdfdest name{page.9} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -1616,8 +1560,6 @@ Completed box being shipped out [9]
 ....\write1{\@writefile{toc}{\protect \beamer@subsectionintoc {3}{1}{Subsection}{9}{0}{3}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionpages {8}{8}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionentry {0}{3}{1}{9}{Subsection}}}}
-....\write5{\protect \BOOKMARK [3][]{Outline0.3.1.9}{\376\377\000S\000u\000b\000s\000e\000c\000t\000i\000o\000n}{Outline0.3}% 6}
-....\pdfdest name{Outline0.3.1.9} xyz
 ....\glue(\topskip) 0.0
 ....\vbox(261.20912+0.0)x307.28987, glue set 117.97325fil
 .....\penalty 10000
@@ -1649,7 +1591,6 @@ Completed box being shipped out [9]
 .......\glue(\parskip) 0.0
 .......\hbox(10.00008+0.0)x241.99265, glue set 96.64658fil
 ........\hbox(0.0+0.0)x0.0
-........\pdfstartlink(*+*)x* attr{/Border[0 0 0]/H/N/C[.5 .5 .5]} action goto name{Navigation8}
 ........\OT1/lmss/bx/n/14.4 S
 ........\OT1/lmss/bx/n/14.4 e
 ........\OT1/lmss/bx/n/14.4 c
@@ -1657,7 +1598,6 @@ Completed box being shipped out [9]
 ........\OT1/lmss/bx/n/14.4 i
 ........\OT1/lmss/bx/n/14.4 o
 ........\OT1/lmss/bx/n/14.4 n
-........\pdfendlink
 ........\penalty 10000
 ........\glue(\parfillskip) 0.0 plus 1.0fil
 ........\glue(\rightskip) 0.0 plus 1.0fil
@@ -1723,7 +1663,6 @@ Completed box being shipped out [9]
 .......\hbox(9.79996+4.20004)x241.99265, glue set 91.44168fil
 ........\hbox(0.0+0.0)x0.0
 ........\rule(9.79996+4.20004)x0.0
-........\pdfstartlink(*+*)x* attr{/Border[0 0 0]/H/N/C[.5 .5 .5]} action goto name{Navigation9}
 ........\OT1/lmss/bx/n/12 S
 ........\OT1/lmss/bx/n/12 u
 ........\OT1/lmss/bx/n/12 b
@@ -1734,7 +1673,6 @@ Completed box being shipped out [9]
 ........\OT1/lmss/bx/n/12 i
 ........\OT1/lmss/bx/n/12 o
 ........\OT1/lmss/bx/n/12 n
-........\pdfendlink
 ........\penalty 10000
 ........\glue(\parfillskip) 0.0 plus 1.0fil
 ........\glue(\rightskip) 0.0 plus 1.0fil
@@ -1791,10 +1729,6 @@ Completed box being shipped out [10]
 ...\kern 0.0
 ...\kern -43.81725
 ...\kern -1.00374
-...\pdfdest name{Navigation10} xyz
-...\penalty 10000
-...\pdfdest name{page.10} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -2024,10 +1958,6 @@ Completed box being shipped out [11]
 ...\kern 0.0
 ...\kern -43.81725
 ...\kern -1.00374
-...\pdfdest name{Navigation11} xyz
-...\penalty 10000
-...\pdfdest name{page.11} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -2076,8 +2006,6 @@ Completed box being shipped out [11]
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@sectionpages {8}{10}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionpages {9}{10}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \sectionentry {4}{Section}{11}{Section}{0}}}}
-....\write5{\protect \BOOKMARK [2][]{Outline0.4}{\376\377\000S\000e\000c\000t\000i\000o\000n}{}% 7}
-....\pdfdest name{Outline0.4} xyz
 ....\glue(\topskip) 0.0
 ....\vbox(261.20912+0.0)x307.28987, glue set 108.90662fil
 .....\penalty 10000
@@ -2112,7 +2040,6 @@ Completed box being shipped out [11]
 ........\pdfcolorstack 0 pop
 .......\glue 5.475
 ......\penalty 0
-......\pdfstartlink(*+*)x* attr{/Border[0 0 0]/H/N/C[.5 .5 .5]} action goto name{Navigation11}
 ......\OT1/lmss/bx/n/14.4 S
 ......\OT1/lmss/bx/n/14.4 e
 ......\OT1/lmss/bx/n/14.4 c
@@ -2120,7 +2047,6 @@ Completed box being shipped out [11]
 ......\OT1/lmss/bx/n/14.4 i
 ......\OT1/lmss/bx/n/14.4 o
 ......\OT1/lmss/bx/n/14.4 n
-......\pdfendlink
 ......\penalty 10000
 ......\glue(\parfillskip) 0.0
 ......\glue(\rightskip) 0.0 plus 1.0fil
@@ -2187,10 +2113,6 @@ Completed box being shipped out [12]
 ...\kern 0.0
 ...\kern -43.81725
 ...\kern -1.00374
-...\pdfdest name{Navigation12} xyz
-...\penalty 10000
-...\pdfdest name{page.12} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -2238,8 +2160,6 @@ Completed box being shipped out [12]
 ....\write1{\@writefile{toc}{\protect \beamer@subsectionintoc {4}{1}{Subsection}{12}{0}{4}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionpages {11}{11}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionentry {0}{4}{1}{12}{Subsection}}}}
-....\write5{\protect \BOOKMARK [3][]{Outline0.4.1.12}{\376\377\000S\000u\000b\000s\000e\000c\000t\000i\000o\000n}{Outline0.4}% 8}
-....\pdfdest name{Outline0.4.1.12} xyz
 ....\glue(\topskip) 0.0
 ....\vbox(261.20912+0.0)x307.28987, glue set 108.90662fil
 .....\penalty 10000
@@ -2275,7 +2195,6 @@ Completed box being shipped out [12]
 ........\pdfcolorstack 0 pop
 .......\glue 5.475
 ......\penalty 0
-......\pdfstartlink(*+*)x* attr{/Border[0 0 0]/H/N/C[.5 .5 .5]} action goto name{Navigation11}
 ......\OT1/lmss/bx/n/14.4 S
 ......\OT1/lmss/bx/n/14.4 e
 ......\OT1/lmss/bx/n/14.4 c
@@ -2283,7 +2202,6 @@ Completed box being shipped out [12]
 ......\OT1/lmss/bx/n/14.4 i
 ......\OT1/lmss/bx/n/14.4 o
 ......\OT1/lmss/bx/n/14.4 n
-......\pdfendlink
 ......\penalty 10000
 ......\glue(\parfillskip) 0.0
 ......\glue(\rightskip) 0.0 plus 1.0fil
@@ -2295,7 +2213,6 @@ Completed box being shipped out [12]
 ......\glue(\leftskip) 0.0 plus 1.0fil
 ......\hbox(0.0+0.0)x0.0
 ......\rule(9.79996+4.20004)x0.0
-......\pdfstartlink(*+*)x* attr{/Border[0 0 0]/H/N/C[.5 .5 .5]} action goto name{Navigation12}
 ......\OT1/lmss/bx/n/12 S
 ......\OT1/lmss/bx/n/12 u
 ......\OT1/lmss/bx/n/12 b
@@ -2306,7 +2223,6 @@ Completed box being shipped out [12]
 ......\OT1/lmss/bx/n/12 i
 ......\OT1/lmss/bx/n/12 o
 ......\OT1/lmss/bx/n/12 n
-......\pdfendlink
 ......\penalty 10000
 ......\glue(\parfillskip) 0.0
 ......\glue(\rightskip) 0.0 plus 1.0fil