From 656e0d39b9472f19bdc24be68d05efb1cdaa0b32 Mon Sep 17 00:00:00 2001
From: Alex Jordan <alex.jordan@pcc.edu>
Date: Thu, 22 Jun 2023 17:27:42 -0700
Subject: [PATCH] remove all beginproblem() from distribution problems

---
 conf/snippets/blankProblem.pg                             | 1 -
 conf/snippets/blankProblem2.pg                            | 3 ---
 courses.dist/modelCourse/templates/set0/prob1.pg          | 1 -
 courses.dist/modelCourse/templates/set0/prob1a.pg         | 1 -
 courses.dist/modelCourse/templates/set0/prob1b.pg         | 1 -
 courses.dist/modelCourse/templates/set0/prob2.pg          | 3 +--
 courses.dist/modelCourse/templates/set0/prob3.pg          | 3 +--
 courses.dist/modelCourse/templates/set0/prob4/prob4.pg    | 1 -
 courses.dist/modelCourse/templates/set0/prob5.pg          | 1 -
 courses.dist/modelCourse/templates/setDemo/c4s5p2.pg      | 1 -
 courses.dist/modelCourse/templates/setDemo/josephus.pg    | 4 +---
 courses.dist/modelCourse/templates/setDemo/limits.pg      | 3 +--
 courses.dist/modelCourse/templates/setDemo/liteApplet1.pg | 3 +--
 courses.dist/modelCourse/templates/setDemo/liteApplet2.pg | 4 +---
 courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg   | 1 -
 courses.dist/modelCourse/templates/setDemo/prob0837.pg    | 2 --
 courses.dist/modelCourse/templates/setDemo/prob5.pg       | 2 --
 courses.dist/modelCourse/templates/setDemo/prob6b.pg      | 2 --
 courses.dist/modelCourse/templates/setDemo/s2_2_1.pg      | 1 -
 .../modelCourse/templates/setDemo/sample_myown_ans.pg     | 3 +--
 .../modelCourse/templates/setDemo/sample_units_ans.pg     | 2 --
 courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg    | 2 --
 .../setMAAtutorial/conditionalquestionexample.pg          | 2 +-
 .../templates/setMAAtutorial/hermitegraphexample.pg       | 2 +-
 .../setMAAtutorial/htmllinksexample/htmllinksexample.pg   | 4 ++--
 .../templates/setMAAtutorial/javaappletexample.pg         | 4 ++--
 .../templates/setMAAtutorial/javascriptexample1.pg        | 5 ++---
 .../templates/setMAAtutorial/javascriptexample2.pg        | 3 +--
 .../modelCourse/templates/setMAAtutorial/liteApplet1.pg   | 3 +--
 .../modelCourse/templates/setMAAtutorial/liteApplet2.pg   | 4 +---
 .../templates/setMAAtutorial/matchinglistexample.pg       | 4 ++--
 .../templates/setMAAtutorial/multiplechoiceexample.pg     | 4 ++--
 .../templates/setMAAtutorial/ontheflygraphicsexample1.pg  | 4 ++--
 .../templates/setMAAtutorial/ontheflygraphicsexample2.pg  | 4 ++--
 .../templates/setMAAtutorial/popuplistexample.pg          | 4 ++--
 .../modelCourse/templates/setMAAtutorial/prob3.pg         | 8 --------
 .../modelCourse/templates/setMAAtutorial/prob4.pg         | 1 -
 .../setMAAtutorial/simplemultiplechoiceexample.pg         | 4 ++--
 .../templates/setMAAtutorial/standardexample.pg           | 3 +--
 .../staticgraphicsexample/staticgraphicsexample.pg        | 2 +-
 .../templates/setMAAtutorial/truefalseexample.pg          | 4 ++--
 .../templates/setMAAtutorial/vectorfieldexample.pg        | 2 --
 .../modelCourse/templates/setOrientation/prob01.pg        | 2 --
 .../modelCourse/templates/setOrientation/prob02.pg        | 2 --
 .../modelCourse/templates/setOrientation/prob03.pg        | 1 -
 .../modelCourse/templates/setOrientation/prob04.pg        | 1 -
 .../modelCourse/templates/setOrientation/prob05/prob05.pg | 2 --
 .../modelCourse/templates/setOrientation/prob06.pg        | 1 -
 .../modelCourse/templates/setOrientation/prob07.pg        | 1 -
 .../modelCourse/templates/setOrientation/prob08.pg        | 1 -
 .../modelCourse/templates/setOrientation/prob09.pg        | 1 -
 .../modelCourse/templates/setOrientation/prob10.pg        | 1 -
 .../modelCourse/templates/setOrientation/prob11.pg        | 1 -
 .../modelCourse/templates/setOrientation/prob12.pg        | 1 -
 .../modelCourse/templates/setOrientation/prob13.pg        | 1 -
 .../modelCourse/templates/setOrientation/prob14/prob14.pg | 2 --
 .../modelCourse/templates/setOrientation/prob15.pg        | 2 --
 doc/parser/extensions/1-function.pg                       | 2 --
 doc/parser/extensions/2-function.pg                       | 2 --
 doc/parser/extensions/3-operator.pg                       | 2 --
 doc/parser/extensions/4-list.pg                           | 2 --
 doc/parser/extensions/5-operator.pg                       | 2 --
 doc/parser/extensions/6-precedence.pg                     | 2 --
 doc/parser/extensions/7-context.pg                        | 2 --
 doc/parser/extensions/8-answer.pg                         | 2 --
 doc/parser/problems/sample01.pg                           | 4 +---
 doc/parser/problems/sample02.pg                           | 2 --
 doc/parser/problems/sample03.pg                           | 2 --
 doc/parser/problems/sample04.pg                           | 2 --
 doc/parser/problems/sample05.pg                           | 2 --
 doc/parser/problems/sample06.pg                           | 2 --
 doc/parser/problems/sample07.pg                           | 2 --
 doc/parser/problems/sample08.pg                           | 2 --
 doc/parser/problems/sample09.pg                           | 2 --
 doc/parser/problems/sample10.pg                           | 2 --
 doc/parser/problems/sample11.pg                           | 2 --
 doc/parser/problems/sample12.pg                           | 2 --
 doc/parser/problems/sample13.pg                           | 2 --
 doc/parser/problems/sample14.pg                           | 2 --
 doc/parser/problems/sample15.pg                           | 2 --
 doc/parser/problems/sample16.pg                           | 2 --
 doc/parser/problems/sample17.pg                           | 2 --
 doc/parser/problems/sample18.pg                           | 2 --
 doc/parser/problems/sample19.pg                           | 2 --
 doc/parser/problems/sample20.pg                           | 2 --
 doc/parser/problems/sample21.pg                           | 2 --
 doc/parser/problems/sample22.pg                           | 4 +---
 87 files changed, 36 insertions(+), 164 deletions(-)

diff --git a/conf/snippets/blankProblem.pg b/conf/snippets/blankProblem.pg
index 205f7b7f56..474fbcc3c4 100644
--- a/conf/snippets/blankProblem.pg
+++ b/conf/snippets/blankProblem.pg
@@ -11,7 +11,6 @@ loadMacros("PG.pl",
 
 ## Do NOT show partial correct answers
 $showPartialCorrectAnswers = 0;
-TEXT(beginproblem());
 
 BEGIN_TEXT
 
diff --git a/conf/snippets/blankProblem2.pg b/conf/snippets/blankProblem2.pg
index 04958fd784..2194340b65 100644
--- a/conf/snippets/blankProblem2.pg
+++ b/conf/snippets/blankProblem2.pg
@@ -23,9 +23,6 @@ loadMacros(
    "PGcourse.pl",      # Customization file for the course
 );
 
-# Print problem number and point value (weight) for the problem
-TEXT(beginproblem());
-
 # Show which answers are correct and which ones are incorrect
 $showPartialCorrectAnswers = 1;
 
diff --git a/courses.dist/modelCourse/templates/set0/prob1.pg b/courses.dist/modelCourse/templates/set0/prob1.pg
index 894cf83040..64639f592d 100644
--- a/courses.dist/modelCourse/templates/set0/prob1.pg
+++ b/courses.dist/modelCourse/templates/set0/prob1.pg
@@ -16,7 +16,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 
 $a = random(-10,-1,1);
diff --git a/courses.dist/modelCourse/templates/set0/prob1a.pg b/courses.dist/modelCourse/templates/set0/prob1a.pg
index a862e59377..312b40820d 100644
--- a/courses.dist/modelCourse/templates/set0/prob1a.pg
+++ b/courses.dist/modelCourse/templates/set0/prob1a.pg
@@ -13,7 +13,6 @@ loadMacros(
 	"PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 
 
diff --git a/courses.dist/modelCourse/templates/set0/prob1b.pg b/courses.dist/modelCourse/templates/set0/prob1b.pg
index d1de6b1c09..853eba5136 100644
--- a/courses.dist/modelCourse/templates/set0/prob1b.pg
+++ b/courses.dist/modelCourse/templates/set0/prob1b.pg
@@ -14,7 +14,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 
 
diff --git a/courses.dist/modelCourse/templates/set0/prob2.pg b/courses.dist/modelCourse/templates/set0/prob2.pg
index 45346fbf96..e2b5fea4a5 100644
--- a/courses.dist/modelCourse/templates/set0/prob2.pg
+++ b/courses.dist/modelCourse/templates/set0/prob2.pg
@@ -14,7 +14,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 
 TEXT(EV2(<<EOT));
@@ -69,4 +68,4 @@ answers must be correct before you get credit for the problem.
 
 
 EOT
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/set0/prob3.pg b/courses.dist/modelCourse/templates/set0/prob3.pg
index 6d8618321e..198481171c 100644
--- a/courses.dist/modelCourse/templates/set0/prob3.pg
+++ b/courses.dist/modelCourse/templates/set0/prob3.pg
@@ -14,7 +14,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 0;
 
 
@@ -75,4 +74,4 @@ problem list page (use the button at the top of this page) and choosing "formatt
 of "text". Sometimes there is a 15-20 second delay in viewing a problem in "typeset" mode the first time.
 EOT
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/set0/prob4/prob4.pg b/courses.dist/modelCourse/templates/set0/prob4/prob4.pg
index d0384ba476..933da600bf 100644
--- a/courses.dist/modelCourse/templates/set0/prob4/prob4.pg
+++ b/courses.dist/modelCourse/templates/set0/prob4/prob4.pg
@@ -16,7 +16,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 0;
 
 
diff --git a/courses.dist/modelCourse/templates/set0/prob5.pg b/courses.dist/modelCourse/templates/set0/prob5.pg
index 6faa34b7e1..5b8bb88121 100644
--- a/courses.dist/modelCourse/templates/set0/prob5.pg
+++ b/courses.dist/modelCourse/templates/set0/prob5.pg
@@ -14,7 +14,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 0;
 
 
diff --git a/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg b/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg
index 9adac50e0e..6eb9981877 100644
--- a/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg
+++ b/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg
@@ -12,7 +12,6 @@ loadMacros("PGbasicmacros.pl",
 			"PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 
 $n = random(3,6,1);
diff --git a/courses.dist/modelCourse/templates/setDemo/josephus.pg b/courses.dist/modelCourse/templates/setDemo/josephus.pg
index 0cfeb57af3..605dca6f76 100644
--- a/courses.dist/modelCourse/templates/setDemo/josephus.pg
+++ b/courses.dist/modelCourse/templates/setDemo/josephus.pg
@@ -146,8 +146,6 @@ parent.gameStatus.document.close()
 
 EOF
 
-
-TEXT(beginproblem());
 TEXT(MODES(
 TeX	 		=>	'',
 Latex2HTML	=> "\begin{rawhtml} <NOSCRIPT> This problem requires that Java
@@ -203,4 +201,4 @@ $ans =3;
 ANS(num_cmp($ans,reltol=>1,format =>"%0.14g") );  #We are allowing 1 percent error for the answer.
 
 			
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setDemo/limits.pg b/courses.dist/modelCourse/templates/setDemo/limits.pg
index 61b42252e7..4bb29e5280 100644
--- a/courses.dist/modelCourse/templates/setDemo/limits.pg
+++ b/courses.dist/modelCourse/templates/setDemo/limits.pg
@@ -8,7 +8,6 @@ loadMacros(
 	"PGauxiliaryFunctions.pl"
 );
 
-TEXT(&beginproblem);
 $showPartialCorrectAnswers = 1;
 
 $a=random(-3,3,1);
@@ -87,4 +86,4 @@ ANS(num_cmp( [ $b, $bp1,'DNE'] , strings => ['DNE'] ))  ;
 ANS(num_cmp( [ $c, 'DNE' ] , strings => ['DNE'] ))  ;
 
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg b/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg
index 7a8cc4c075..a00e0178be 100644
--- a/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg
+++ b/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg
@@ -6,7 +6,6 @@ loadMacros("PGbasicmacros.pl",
 ); 
 
 $showPartialCorrectAnswers = 1;
-TEXT(beginproblem());
 
 # The link to the java applet is hard wired to use the java applet
 # served from the University of Rochester WeBWorK machine.
@@ -65,4 +64,4 @@ ANS(num_cmp(dist($kandahar,$shindand),      reltol => 3,  units=>'km'));
 
 
 			
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg b/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg
index 6f251df90e..00b754242d 100644
--- a/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg
+++ b/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg
@@ -6,8 +6,6 @@ loadMacros("PGbasicmacros.pl",
 ); 
 
 $showPartialCorrectAnswers = 1;
-TEXT(beginproblem());
-
 
 BEGIN_TEXT
 This is  a lite applet designed by Frank Wattenberg.
@@ -71,4 +69,4 @@ ANS(num_cmp(dist(cityLoc($index[2]),cityLoc($index[2])),   reltol=>3,         un
 
 
 			
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg b/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg
index 93bbc266e5..632cad14d7 100644
--- a/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg
+++ b/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg
@@ -13,7 +13,6 @@ loadMacros(
 	"PGgraphmacros.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 0;
 
 $a=random(0, 6.3, .1);
diff --git a/courses.dist/modelCourse/templates/setDemo/prob0837.pg b/courses.dist/modelCourse/templates/setDemo/prob0837.pg
index 62e556e756..bd39f44c66 100644
--- a/courses.dist/modelCourse/templates/setDemo/prob0837.pg
+++ b/courses.dist/modelCourse/templates/setDemo/prob0837.pg
@@ -8,8 +8,6 @@ loadMacros( "PGbasicmacros.pl",
 	             "PG_CAPAmacros.pl"
 );
 	 
-TEXT(beginproblem());
-	
 # machine translated from CAPA.  
 # This is probaly not a good model for elegant PG code.	
 ## **************************************
diff --git a/courses.dist/modelCourse/templates/setDemo/prob5.pg b/courses.dist/modelCourse/templates/setDemo/prob5.pg
index 7cf8acb646..670194a3fe 100644
--- a/courses.dist/modelCourse/templates/setDemo/prob5.pg
+++ b/courses.dist/modelCourse/templates/setDemo/prob5.pg
@@ -49,8 +49,6 @@ return( $a*Math.pow(x,2) + $b*x +$c );}
 
 EOF
 
-
-TEXT(beginproblem());
 TEXT(MODES(
 TeX	 		=>	'',
 Latex2HTML	=> "\begin{rawhtml} <NOSCRIPT> This problem requires that Java
diff --git a/courses.dist/modelCourse/templates/setDemo/prob6b.pg b/courses.dist/modelCourse/templates/setDemo/prob6b.pg
index 74a2fd86f4..60cc2f3e5f 100644
--- a/courses.dist/modelCourse/templates/setDemo/prob6b.pg
+++ b/courses.dist/modelCourse/templates/setDemo/prob6b.pg
@@ -27,8 +27,6 @@ END_TEXT
 $p = random(2,9,1);  # multiplier
 $p2 = ( $p % 2 == 0) ? 2*$p : $p;
 
-TEXT(beginproblem());
-
 # The link to the java applet is hard wired to use the java applet
 # served from the University of Rochester WeBWorK machine.
 # It is possible to set this up so that the java applet is served
diff --git a/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg b/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg
index 6232790fd4..b01f44e3e6 100644
--- a/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg
+++ b/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg
@@ -11,7 +11,6 @@ loadMacros(
 	"PGauxiliaryFunctions.pl"
 );
 
-TEXT(&beginproblem);
 $showPartialCorrectAnswers = 1;
 
 $a1 = random(2,7,1);
diff --git a/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg b/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg
index 8153a8f3e9..3b7da75f8f 100644
--- a/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg
+++ b/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg
@@ -6,7 +6,6 @@ loadMacros(
 	"PGanswermacros.pl"
 );
 
-TEXT(&beginproblem);
 $showPartialCorrectAnswers = 1;
  
 BEGIN_TEXT
@@ -83,4 +82,4 @@ $strict_palindrome_test = sub {
     
 ANS($strict_palindrome_test);
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg b/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg
index 84cbe6cc8e..a72a70a5a9 100644
--- a/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg
+++ b/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg
@@ -5,8 +5,6 @@ loadMacros( "PGbasicmacros.pl",
 	        "PGanswermacros.pl",
 );
 
-TEXT(beginproblem());
-
 $showPartialCorrectAnswers = 1;
 $showHint =0;
 
diff --git a/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg b/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg
index 03f9e5a2fa..c4c663dcda 100644
--- a/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg
+++ b/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg
@@ -15,8 +15,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(&beginproblem);
-
 $showPartialCorrectAnswers = 1;
 
 #install_problem_grader(~~&std_problem_grader);    ##uncomment to use std grader
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/conditionalquestionexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/conditionalquestionexample.pg
index affe1f9138..4b067b39ee 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/conditionalquestionexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/conditionalquestionexample.pg
@@ -4,7 +4,7 @@ loadMacros(
         "PGchoicemacros.pl",
         "PGanswermacros.pl"
 );
-TEXT(beginproblem(), $BR,$BBOLD, "Conditional questions example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "Conditional questions example", $EBOLD, $BR,$BR);
 $showPartialCorrectAnswers = 1;
 
 $a1 = random(3,25,1);
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/hermitegraphexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/hermitegraphexample.pg
index 8da29ac397..8af5c95cbf 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/hermitegraphexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/hermitegraphexample.pg
@@ -5,7 +5,7 @@ loadMacros("PGbasicmacros.pl",
            "PGnumericalmacros.pl",
            "PGgraphmacros.pl"
 );
-TEXT(beginproblem(), $BR,$BBOLD, "Hermite polynomial graph example", $EBOLD, $BR,$BR); 
+TEXT($BBOLD, "Hermite polynomial graph example", $EBOLD, $BR,$BR);
 $showPartialAnswers = 1;
 
 $graph = init_graph(-5,-5,5,5,'axes'=>[0,0],'grid'=>[10,10]);
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/htmllinksexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/htmllinksexample.pg
index 708fb789a6..2d2b34176a 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/htmllinksexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/htmllinksexample.pg
@@ -5,7 +5,7 @@ loadMacros("PGbasicmacros.pl",
 );
 $showPartialCorrectAnswers = 0;
 
-TEXT(beginproblem(), $BR,$BBOLD, "HTML links example", $EBOLD, $BR,$BR); 
+TEXT($BBOLD, "HTML links example", $EBOLD, $BR,$BR)
 
 BEGIN_TEXT
 This example shows how to link to resources outside the problem itself.
@@ -77,4 +77,4 @@ TEXT(
    endtable()
 );
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/javaappletexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/javaappletexample.pg
index fee0411cbc..c42740511e 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/javaappletexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/javaappletexample.pg
@@ -6,7 +6,7 @@ loadMacros("PG.pl",
            "PGanswermacros.pl",
            ); 
  
-TEXT(beginproblem(), $BR,$BBOLD, "Java applet example", $EBOLD, $BR,$BR); 
+TEXT($BBOLD, "Java applet example", $EBOLD, $BR,$BR);
 # define function to be evaluated
 $a= random(1,3,1);
 $b= random(-4,4,.1);
@@ -92,4 +92,4 @@ ANS(str_cmp('No')  );
 ANS(function_cmp( '(a/2)^2', 'a') );
 
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample1.pg b/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample1.pg
index 1f76031c1b..b12f48a0aa 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample1.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample1.pg
@@ -5,7 +5,7 @@ loadMacros(
            "PGchoicemacros.pl",
            "PGanswermacros.pl",
 ); 
-TEXT(beginproblem(), $BR,$BBOLD, "JavaScript Example 1", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "JavaScript Example 1", $EBOLD, $BR,$BR);
 # define function to be evaluated
 $a= random(1,3,1);
 $b= random(-4,4,.1);
@@ -43,7 +43,6 @@ return( $a*Math.pow(x,2) + $b*x +$c );}
 
 EOF
 
-TEXT(beginproblem());
 TEXT(MODES( TeX => "",
 	        Latex2HTML => "\begin{rawhtml}
                          <NOSCRIPT> This problem requires that Java Script be 
@@ -143,4 +142,4 @@ TEXT(MODES(
 
 ANS(num_cmp($ans,reltol => 1) );  #We are allowing 1 percent error for the answer.
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample2.pg b/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample2.pg
index 898f77e842..53be40e27a 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample2.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample2.pg
@@ -5,7 +5,7 @@ loadMacros("PGbasicmacros.pl",
            "PGanswermacros.pl",
            "PGnumericalmacros.pl",  # needed for the javaScript spline code
            ); 
-TEXT(beginproblem(), $BR,$BBOLD, "JavaScript Example 2", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "JavaScript Example 2", $EBOLD, $BR,$BR);
 
 # define function to be evaluated
 $a= random(1,3,1);
@@ -49,7 +49,6 @@ $javascript= javaScript_cubic_spline(~~@x, ~~@y, name =>'func');
 HEADER_TEXT( javaScript_cubic_spline(~~@x, ~~@y, name =>'func')  );  
 
 
-TEXT(beginproblem());
 TEXT(MODES( TeX => "",
 	        Latex2HTML => "\begin{rawhtml}
                          <NOSCRIPT> This problem requires that Java Script be 
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet1.pg b/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet1.pg
index 7a8cc4c075..a00e0178be 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet1.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet1.pg
@@ -6,7 +6,6 @@ loadMacros("PGbasicmacros.pl",
 ); 
 
 $showPartialCorrectAnswers = 1;
-TEXT(beginproblem());
 
 # The link to the java applet is hard wired to use the java applet
 # served from the University of Rochester WeBWorK machine.
@@ -65,4 +64,4 @@ ANS(num_cmp(dist($kandahar,$shindand),      reltol => 3,  units=>'km'));
 
 
 			
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet2.pg b/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet2.pg
index 6f251df90e..00b754242d 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet2.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet2.pg
@@ -6,8 +6,6 @@ loadMacros("PGbasicmacros.pl",
 ); 
 
 $showPartialCorrectAnswers = 1;
-TEXT(beginproblem());
-
 
 BEGIN_TEXT
 This is  a lite applet designed by Frank Wattenberg.
@@ -71,4 +69,4 @@ ANS(num_cmp(dist(cityLoc($index[2]),cityLoc($index[2])),   reltol=>3,         un
 
 
 			
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/matchinglistexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/matchinglistexample.pg
index 6d85a7eddc..300c8db8e9 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/matchinglistexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/matchinglistexample.pg
@@ -7,7 +7,7 @@ loadMacros(
  );
 
 
-TEXT(beginproblem(), $BR,$BBOLD, "Matching list example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "Matching list example", $EBOLD, $BR,$BR);
 
 
 # Since this is a matching question, we do not usually wish to tell students
@@ -126,4 +126,4 @@ END_TEXT
 # Enter the correct answers to be checked against the answers to the students.
 ANS( str_cmp( $ml->ra_correct_ans )   ) ;
 
-ENDDOCUMENT();      
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/multiplechoiceexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/multiplechoiceexample.pg
index d1144f0740..42d81e42b2 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/multiplechoiceexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/multiplechoiceexample.pg
@@ -4,7 +4,7 @@ loadMacros("PGbasicmacros.pl",
         "PGanswermacros.pl",
 
 );
-TEXT(beginproblem(), $BR,$BBOLD, "Multiple choice example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "Multiple choice example", $EBOLD, $BR,$BR);
 
 $showPartialCorrectAnswers = 0;
 # Make a new multiple choice object.
@@ -42,4 +42,4 @@ END_TEXT
 # Enter the correct answers to be checked against the answers to the students.
 ANS( str_cmp( $mc->correct_ans )   ) ;
 
-ENDDOCUMENT();     
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample1.pg b/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample1.pg
index be9bda7efa..f3423c4e1e 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample1.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample1.pg
@@ -6,7 +6,7 @@ loadMacros(
            "PGgraphmacros.pl"
 );
           
-TEXT(beginproblem(), $BR,$BBOLD, "On-the-fly Graphics Example1", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "On-the-fly Graphics Example1", $EBOLD, $BR,$BR);
 $showPartialCorrectAnswers = 0;
 
 # First we define a graph with x and y in the range -4 to 4, axes (strong lines) 
@@ -114,4 +114,4 @@ derivatives (click on the graph to see an enlarged image):$PAR
 END_TEXT
 ANS(str_cmp( [@scrambled_labels] ) );
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample2.pg b/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample2.pg
index 063ae5804d..16144c5b56 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample2.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample2.pg
@@ -6,7 +6,7 @@ loadMacros("PGbasicmacros.pl",
            "PGgraphmacros.pl"
 );
            
-TEXT(beginproblem(), $BR,$BBOLD, "On-the-fly Graphics Example2", $EBOLD, $BR,$BR); 
+TEXT($BBOLD, "On-the-fly Graphics Example2", $EBOLD, $BR,$BR);
 
 # First we define a graph with x and y in the range -4 to 4, axes (strong lines) 
 # defined at the point [0,0] and
@@ -121,4 +121,4 @@ END_TEXT
 
 ANS(str_cmp( [@scrambled_labels] ) );
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/popuplistexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/popuplistexample.pg
index eed7511d1d..b31fc8a5e5 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/popuplistexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/popuplistexample.pg
@@ -5,7 +5,7 @@ loadMacros("PGbasicmacros.pl",
            "PGanswermacros.pl",
 );
 
-TEXT(beginproblem(), $BR,$BBOLD, "True False Pop-up Example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "True False Pop-up Example", $EBOLD, $BR,$BR);
 $showPartialCorrectAnswers = 0;
 
 # Make a new select list
@@ -62,4 +62,4 @@ END_TEXT
 # Enter the correct answers to be checked against the answers to the students.
 ANS( str_cmp( $tf->ra_correct_ans )   ) ;
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/prob3.pg b/courses.dist/modelCourse/templates/setMAAtutorial/prob3.pg
index 7c1671c93c..01696bcc78 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/prob3.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/prob3.pg
@@ -19,14 +19,6 @@ loadMacros("PGbasicmacros.pl",
 # Is the simplest way of printing text, each string in the input is immediately printed.
 # It does not do any of the simplifying and evaluating tricks performed by the BEGIN_TEXT/END_TEXT construction.
 
-# beginproblem() is a macro which outputs the string 
-# which contains the number
-# of points the problem is worth.
-
-# Putting these two ideas together prints the standard opening line of a problem.
-# We will use this construction routinely at the beginning of all subsequent problems.
-TEXT(beginproblem());
-
 # Since this is a matching questions, we do not usually wish to tell students which
 # parts of the matching question have been answered correctly and which are
 # incorrect.  That is too easy.  To accomplish this we set the following flag to zero.
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/prob4.pg b/courses.dist/modelCourse/templates/setMAAtutorial/prob4.pg
index 7d52a89951..084d6af438 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/prob4.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/prob4.pg
@@ -12,7 +12,6 @@ loadMacros("PGbasicmacros.pl",
            "PGnumericalmacros.pl"
            );
  
-TEXT(&beginproblem);
 $showPartialCorrectAnswers = 0;
 
 
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/simplemultiplechoiceexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/simplemultiplechoiceexample.pg
index f62e09bb28..2f4650ec46 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/simplemultiplechoiceexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/simplemultiplechoiceexample.pg
@@ -4,7 +4,7 @@ loadMacros(
                     "PGchoicemacros.pl", 
                     "PGanswermacros.pl",
 );
-TEXT(beginproblem(), $BR,$BBOLD, "Multiple choice example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "Multiple choice example", $EBOLD, $BR,$BR);
 
    
 $showPartialCorrectAnswers = 0;
@@ -30,4 +30,4 @@ $PAR Enter the letter corresponding to the correct answer: \{ ans_rule(10) \}
 END_TEXT
 ANS( str_cmp( $inverted_alphabet[0] )   ) ;
 
-ENDDOCUMENT(); 
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/standardexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/standardexample.pg
index 29ea3ecfca..15540480c2 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/standardexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/standardexample.pg
@@ -5,7 +5,7 @@ loadMacros("PGbasicmacros.pl",
            "PGauxiliaryFunctions.pl"    
 );     
 
-TEXT(beginproblem(), $BR,$BBOLD, "Standard Example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "Standard Example", $EBOLD, $BR,$BR);
 
 # A question requiring a string answer.
 $str = 'world'; 
@@ -44,4 +44,3 @@ $new_exponent = $b-1;
 $ans2 = "$b*x^($new_exponent)";
 ANS( fun_cmp( $ans2 ) );
 ENDDOCUMENT();
- 
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/staticgraphicsexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/staticgraphicsexample.pg
index c86fc18a45..02ed678ce5 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/staticgraphicsexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/staticgraphicsexample.pg
@@ -3,7 +3,7 @@ loadMacros("PGbasicmacros.pl",
            "PGchoicemacros.pl",
            "PGanswermacros.pl"
 );
-TEXT(beginproblem(), $BR,$BBOLD, "Static graphics Example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "Static graphics Example", $EBOLD, $BR,$BR);
 
 $showPartialCorrectAnswers = 0;
 # Define which of the three sets of pictures to use
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/truefalseexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/truefalseexample.pg
index 36e59f0f87..42f6abe70b 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/truefalseexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/truefalseexample.pg
@@ -4,7 +4,7 @@ loadMacros("PGbasicmacros.pl",
            "PGanswermacros.pl",
 
 );
-TEXT(beginproblem(), $BR,$BBOLD, "True False Example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "True False Example", $EBOLD, $BR,$BR);
 
 # Since this is a true questions, we do not usually wish to tell students which
 # parts of the matching question have been answered correctly and which are
@@ -60,4 +60,4 @@ END_TEXT
 
 ANS( str_cmp( $tf->ra_correct_ans )   ) ;
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/vectorfieldexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/vectorfieldexample.pg
index 1763620ced..309c092ced 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/vectorfieldexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/vectorfieldexample.pg
@@ -7,8 +7,6 @@ loadMacros("PG.pl",
            "PGgraphmacros.pl",        
 );
 
-TEXT(beginproblem()); # standard preamble to each problem.
-
 # Since this is a true questions, we do not usually wish to tell students which
 # parts of the matching question have been answered correctly and which are
 # incorrect.  That is too easy.  To accomplish this we set the following flag to zero.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob01.pg b/courses.dist/modelCourse/templates/setOrientation/prob01.pg
index 3c34350fb8..f86f4bcff4 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob01.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob01.pg
@@ -8,8 +8,6 @@ loadMacros(
 );
 
 
-TEXT(beginproblem());
-
 Title("Understanding $WW Problem Pages");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob02.pg b/courses.dist/modelCourse/templates/setOrientation/prob02.pg
index 6051741e6d..eb10283bed 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob02.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob02.pg
@@ -8,8 +8,6 @@ loadMacros(
 );
 
 
-TEXT(beginproblem());
-
 Title("Controlling $WW");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob03.pg b/courses.dist/modelCourse/templates/setOrientation/prob03.pg
index fef926ba5d..8692f83f1c 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob03.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob03.pg
@@ -12,7 +12,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Typing in Your Answers");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob04.pg b/courses.dist/modelCourse/templates/setOrientation/prob04.pg
index 09a051ade6..4f7e93577c 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob04.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob04.pg
@@ -13,7 +13,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Rules of Precedence");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob05/prob05.pg b/courses.dist/modelCourse/templates/setOrientation/prob05/prob05.pg
index 3e9f0f9fb2..7eaffa7d5d 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob05/prob05.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob05/prob05.pg
@@ -12,8 +12,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem);
-
 Title("Common Errors to Avoid");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob06.pg b/courses.dist/modelCourse/templates/setOrientation/prob06.pg
index 0cb30734d2..14da12db6a 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob06.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob06.pg
@@ -15,7 +15,6 @@ Context("Numeric")->variables->are(y=>'Real'); $y = Formula('y');
 Context("Numeric")->variables->are(x=>'Real'); $x = Formula('x');
 Context()->flags->set(limits=>[0,2]);
 
-TEXT(beginproblem());
 Title("Using Parentheses Effectively");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob07.pg b/courses.dist/modelCourse/templates/setOrientation/prob07.pg
index ae4813dda1..31c041518b 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob07.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob07.pg
@@ -13,7 +13,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Constants and Functions in $WW");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob08.pg b/courses.dist/modelCourse/templates/setOrientation/prob08.pg
index 4534a5c325..a8f06aba30 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob08.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob08.pg
@@ -14,7 +14,6 @@ Context("Numeric")->variables->are(x=>'Real'); $x = Formula('x');
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Rules of Precedence (Again)");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob09.pg b/courses.dist/modelCourse/templates/setOrientation/prob09.pg
index 08c31ab5ce..7d65426f03 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob09.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob09.pg
@@ -10,7 +10,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Non-Numeric Answers");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob10.pg b/courses.dist/modelCourse/templates/setOrientation/prob10.pg
index 2b1d392e58..d0c0d6d24a 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob10.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob10.pg
@@ -11,7 +11,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Points and Vectors");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob11.pg b/courses.dist/modelCourse/templates/setOrientation/prob11.pg
index ca5a2227c5..9703f9b6d1 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob11.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob11.pg
@@ -10,7 +10,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Multiple Answers in One Blank");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob12.pg b/courses.dist/modelCourse/templates/setOrientation/prob12.pg
index 117d7992e3..13c2574f1d 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob12.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob12.pg
@@ -9,7 +9,6 @@ loadMacros(
   "PGcourse.pl",
 );
 
-TEXT(beginproblem());
 Title("True/False Questions in $WW");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob13.pg b/courses.dist/modelCourse/templates/setOrientation/prob13.pg
index 7c43672d71..261adc2840 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob13.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob13.pg
@@ -9,7 +9,6 @@ loadMacros(
   "PGcourse.pl",
 );
 
-TEXT(beginproblem());
 Title("Matching Lists in $WW");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.pg b/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.pg
index 0e4402efe7..41a89857e5 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.pg
@@ -17,8 +17,6 @@ loadMacros(
 $htmlWebworkURL = "http://omega.math.union.edu/webwork2_files/local";
 $hintURL = "${htmlWebworkURL}/parserOrientation/prob14-hint.html";
 
-TEXT(beginproblem);
-
 Title("Matching Graphs in $WW");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob15.pg b/courses.dist/modelCourse/templates/setOrientation/prob15.pg
index cebd3a369b..b8d710bd55 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob15.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob15.pg
@@ -8,8 +8,6 @@ loadMacros(
 );
 
 
-TEXT(beginproblem());
-
 Title("When You're Stuck...");
 
 ##############################################
diff --git a/doc/parser/extensions/1-function.pg b/doc/parser/extensions/1-function.pg
index 8f734a4ff1..1a4179becf 100644
--- a/doc/parser/extensions/1-function.pg
+++ b/doc/parser/extensions/1-function.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   Use  standard numeric mode
diff --git a/doc/parser/extensions/2-function.pg b/doc/parser/extensions/2-function.pg
index 5ec149472e..2c68409c74 100644
--- a/doc/parser/extensions/2-function.pg
+++ b/doc/parser/extensions/2-function.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   Use  standard numeric mode
diff --git a/doc/parser/extensions/3-operator.pg b/doc/parser/extensions/3-operator.pg
index b1098b400e..1fa295c30a 100644
--- a/doc/parser/extensions/3-operator.pg
+++ b/doc/parser/extensions/3-operator.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  Define our own binary operator
diff --git a/doc/parser/extensions/4-list.pg b/doc/parser/extensions/4-list.pg
index 781615b90b..0184117b22 100644
--- a/doc/parser/extensions/4-list.pg
+++ b/doc/parser/extensions/4-list.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  Define our own [n,r] notation for n choose r
diff --git a/doc/parser/extensions/5-operator.pg b/doc/parser/extensions/5-operator.pg
index fc59695013..60dea5eb2b 100644
--- a/doc/parser/extensions/5-operator.pg
+++ b/doc/parser/extensions/5-operator.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  Define our own operator for equality
diff --git a/doc/parser/extensions/6-precedence.pg b/doc/parser/extensions/6-precedence.pg
index eb770f84cc..5997a2a838 100644
--- a/doc/parser/extensions/6-precedence.pg
+++ b/doc/parser/extensions/6-precedence.pg
@@ -13,8 +13,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  Use standard precedences for multiplication
diff --git a/doc/parser/extensions/7-context.pg b/doc/parser/extensions/7-context.pg
index 312f8224c3..191c22d2c7 100644
--- a/doc/parser/extensions/7-context.pg
+++ b/doc/parser/extensions/7-context.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 BEGIN_TEXT
 
 In this problem, we compare formulas in complex and vector contexts.
diff --git a/doc/parser/extensions/8-answer.pg b/doc/parser/extensions/8-answer.pg
index 6f76804e82..9a45e3b720 100644
--- a/doc/parser/extensions/8-answer.pg
+++ b/doc/parser/extensions/8-answer.pg
@@ -17,8 +17,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  Use Vector context
diff --git a/doc/parser/problems/sample01.pg b/doc/parser/problems/sample01.pg
index 492f8fdb67..2d810de877 100644
--- a/doc/parser/problems/sample01.pg
+++ b/doc/parser/problems/sample01.pg
@@ -12,8 +12,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   Use  standard numeric mode
@@ -63,4 +61,4 @@ $showPartialCorrectAnswers = 1;
 
 ###########################################################
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample02.pg b/doc/parser/problems/sample02.pg
index c0cc938862..b57c1fadb2 100644
--- a/doc/parser/problems/sample02.pg
+++ b/doc/parser/problems/sample02.pg
@@ -12,8 +12,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   Use  standard numeric mode
diff --git a/doc/parser/problems/sample03.pg b/doc/parser/problems/sample03.pg
index 15fe482fe8..d473412c87 100644
--- a/doc/parser/problems/sample03.pg
+++ b/doc/parser/problems/sample03.pg
@@ -13,8 +13,6 @@ loadMacros(
   "Differentiation.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   Use standard numeric mode
diff --git a/doc/parser/problems/sample04.pg b/doc/parser/problems/sample04.pg
index e325f1df9c..ea39ec7192 100644
--- a/doc/parser/problems/sample04.pg
+++ b/doc/parser/problems/sample04.pg
@@ -17,8 +17,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(&beginproblem);
-
 ##############################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample05.pg b/doc/parser/problems/sample05.pg
index ba69a452c4..35ba15f09f 100644
--- a/doc/parser/problems/sample05.pg
+++ b/doc/parser/problems/sample05.pg
@@ -17,8 +17,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(&beginproblem);
-
 ##############################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample06.pg b/doc/parser/problems/sample06.pg
index a15ea0b2c1..e4d8102bee 100644
--- a/doc/parser/problems/sample06.pg
+++ b/doc/parser/problems/sample06.pg
@@ -12,8 +12,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample07.pg b/doc/parser/problems/sample07.pg
index cacfc7d25e..64a320dc06 100644
--- a/doc/parser/problems/sample07.pg
+++ b/doc/parser/problems/sample07.pg
@@ -11,8 +11,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample08.pg b/doc/parser/problems/sample08.pg
index 42e7f332ec..6c7b6d73d1 100644
--- a/doc/parser/problems/sample08.pg
+++ b/doc/parser/problems/sample08.pg
@@ -11,8 +11,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample09.pg b/doc/parser/problems/sample09.pg
index dbf228f5c2..b2a9776653 100644
--- a/doc/parser/problems/sample09.pg
+++ b/doc/parser/problems/sample09.pg
@@ -11,8 +11,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample10.pg b/doc/parser/problems/sample10.pg
index b63e9e9d92..5a25b8e800 100644
--- a/doc/parser/problems/sample10.pg
+++ b/doc/parser/problems/sample10.pg
@@ -11,8 +11,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample11.pg b/doc/parser/problems/sample11.pg
index 1e1c8514a0..8a1ff5e41d 100644
--- a/doc/parser/problems/sample11.pg
+++ b/doc/parser/problems/sample11.pg
@@ -11,8 +11,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample12.pg b/doc/parser/problems/sample12.pg
index db981a1a7d..36222469d9 100644
--- a/doc/parser/problems/sample12.pg
+++ b/doc/parser/problems/sample12.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample13.pg b/doc/parser/problems/sample13.pg
index 53d7e09671..5ad161d529 100644
--- a/doc/parser/problems/sample13.pg
+++ b/doc/parser/problems/sample13.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample14.pg b/doc/parser/problems/sample14.pg
index fbe0f9dd42..5ffef3f161 100644
--- a/doc/parser/problems/sample14.pg
+++ b/doc/parser/problems/sample14.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample15.pg b/doc/parser/problems/sample15.pg
index 2bb48e6140..de84abe8b1 100644
--- a/doc/parser/problems/sample15.pg
+++ b/doc/parser/problems/sample15.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample16.pg b/doc/parser/problems/sample16.pg
index f81d89d65e..4317142848 100644
--- a/doc/parser/problems/sample16.pg
+++ b/doc/parser/problems/sample16.pg
@@ -13,8 +13,6 @@ loadMacros(
   "Differentiation.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample17.pg b/doc/parser/problems/sample17.pg
index 710f801a6c..4fea5b52da 100644
--- a/doc/parser/problems/sample17.pg
+++ b/doc/parser/problems/sample17.pg
@@ -13,8 +13,6 @@ loadMacros(
   "Differentiation.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample18.pg b/doc/parser/problems/sample18.pg
index 1321ea31f6..8d6fa17afd 100644
--- a/doc/parser/problems/sample18.pg
+++ b/doc/parser/problems/sample18.pg
@@ -13,8 +13,6 @@ loadMacros(
   "Differentiation.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample19.pg b/doc/parser/problems/sample19.pg
index 3b29af6e59..a0c0cf0e9a 100644
--- a/doc/parser/problems/sample19.pg
+++ b/doc/parser/problems/sample19.pg
@@ -13,8 +13,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample20.pg b/doc/parser/problems/sample20.pg
index bfe6b74f6b..ecde485d70 100644
--- a/doc/parser/problems/sample20.pg
+++ b/doc/parser/problems/sample20.pg
@@ -12,8 +12,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample21.pg b/doc/parser/problems/sample21.pg
index 0a7d71addf..bf5c213f85 100644
--- a/doc/parser/problems/sample21.pg
+++ b/doc/parser/problems/sample21.pg
@@ -13,8 +13,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample22.pg b/doc/parser/problems/sample22.pg
index 2074914724..ba43b73657 100644
--- a/doc/parser/problems/sample22.pg
+++ b/doc/parser/problems/sample22.pg
@@ -13,8 +13,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
@@ -57,4 +55,4 @@ ANS($L->cmp);
 
 ###########################################################
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.