diff --git a/src/root/build.tt b/src/root/build.tt
index 3f1ae08d..86ae4b2d 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -207,13 +207,13 @@
 
                                 <h2 id="nix-error">Nix error output</h2>
 
-                                <pre class="buildlog">[% HTML.escape(build.errormsg) -%]</pre>
+                                <pre class="buildlog">[% HTML.escape(build.errormsg) %]</pre>
                         [% END %]
                 [% END %]
 
                 [% IF logtext %]
                         <h2>Log</h2>
-                        <pre class="buildlog">[% HTML.escape(logtext) -%]</pre>
+                        <pre class="buildlog">[% HTML.escape(logtext) %]</pre>
                 [% END %]
         </div>
         <div id="tabs-information" class="tab-pane">
@@ -320,7 +320,7 @@
                     <tr><th>Name</th><th>Type</th><th>Value</th><th>Revision</th><th>Store path</th></tr>
                   </thead>
                   <tbody>
-                    [% FOREACH input IN build.inputs -%]
+                    [% FOREACH input IN build.inputs %]
                       <tr>
                         <td><tt>[% input.name %]</tt></td>
                         <td><tt>[% type = input.type; inputTypes.$type %]</tt></td>
@@ -336,7 +336,7 @@
                         <td>[% IF input.revision %][% input.revision %][% END %]</td>
                         <td><tt>[% input.path %]</tt></td>
                       </tr>
-                    [% END -%]
+                    [% END %]
                   </tbody>
                 </table>
 
@@ -375,14 +375,14 @@
                     <tr><th>Build</th><th>Input name</th><th>System</th><th>Timestamp</th></tr>
                   </thead>
                   <tbody>
-                    [% FOREACH input IN build.dependents -%]
+                    [% FOREACH input IN build.dependents %]
                       <tr>
                         <td>[% INCLUDE renderFullBuildLink build=input.build %]</td>
                         <td><tt>[% input.name %]</tt></td>
                         <td><tt>[% input.build.system %]</tt></td>
                         <td>[% INCLUDE renderDateTime timestamp = input.build.timestamp %]</td>
                       </tr>
-                    [% END -%]
+                    [% END %]
                   </tbody>
                 </table>
     </div>
diff --git a/src/root/channel-contents.tt b/src/root/channel-contents.tt
index fd3f7228..0c5a899b 100644
--- a/src/root/channel-contents.tt
+++ b/src/root/channel-contents.tt
@@ -59,11 +59,11 @@ install the package simply by clicking on the packages below.</p>
         <td><a href="[% uri %]"><tt>[% build.get_column('releasename') || build.nixname %]</tt></a></td>
         <td><tt>[% build.system %]</tt></td>
         <td>
-          [% IF build.homepage -%]
+          [% IF build.homepage %]
             <a [% HTML.attributes(href => build.homepage) %]>[% HTML.escape(build.description) %]</a>
-          [% ELSE -%]
-            [% HTML.escape(build.description) -%]
-          [% END -%]
+          [% ELSE %]
+            [% HTML.escape(build.description) %]
+          [% END %]
           [% IF pkg.outName != 'out' %] [[% pkg.outName %]][% END %]
         </td>
       </tr>
diff --git a/src/root/clone-build.tt b/src/root/clone-build.tt
index 7dde7a49..95dede4f 100644
--- a/src/root/clone-build.tt
+++ b/src/root/clone-build.tt
@@ -26,7 +26,7 @@
       <tr><th>Name</th><th>Type</th><th>Value</th></tr>
     </thead>
     <tbody>
-      [% FOREACH input IN build.inputs -%]
+      [% FOREACH input IN build.inputs %]
         <tr>
           <td><tt>[% input.name %]<input type="hidden" [% HTML.attributes(name => "input-$input.name-name" value => input.name) %] /></tt></td>
           <td>
@@ -42,7 +42,7 @@
               [% END %] /></tt>
           </td>
         </tr>
-      [% END -%]
+      [% END %]
     </tbody>
   </table>
 
diff --git a/src/root/common.tt b/src/root/common.tt
index 65a6c016..5473b2a2 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -1,9 +1,9 @@
-[%- USE date -%]
-[%- USE String -%]
-[%- USE HTML -%]
+[% USE date %]
+[% USE String %]
+[% USE HTML %]
 
 
-[%- inputTypes =
+[% inputTypes =
     { "svn" = "Subversion export"
     , "svn-checkout" = "Subversion checkout"
     , "bzr" = "Bazaar export"
@@ -16,42 +16,42 @@
     , "build" = "Build output"
     , "sysbuild" = "Build output (same system)"
     }
--%]
+%]
 
 
-[%- BLOCK renderDateTime -%]
-  [% date.format(timestamp, '%Y-%m-%d %H:%M:%S') -%]
-[%- END -%]
+[% BLOCK renderDateTime %]
+  [% date.format(timestamp, '%Y-%m-%d %H:%M:%S') %]
+[% END %]
 
 
-[%- BLOCK renderProjectName -%]
-<a href="[% c.uri_for('/project' project) %]"><tt>[% project %]</tt></a>[% END -%]
+[% BLOCK renderProjectName %]
+<a href="[% c.uri_for('/project' project) %]"><tt>[% project %]</tt></a>[% END %]
 
 
-[%- BLOCK renderJobsetName -%]
-<a href="[% c.uri_for('/jobset' project jobset) %]"><tt>[% jobset %]</tt></a>[% END -%]
+[% BLOCK renderJobsetName %]
+<a href="[% c.uri_for('/jobset' project jobset) %]"><tt>[% jobset %]</tt></a>[% END %]
 
 
-[%- BLOCK renderJobName -%]
-<a href="[% c.uri_for('/job' project jobset job) %]"><tt>[% job %]</tt></a>[% END -%]
+[% BLOCK renderJobName %]
+<a href="[% c.uri_for('/job' project jobset job) %]"><tt>[% job %]</tt></a>[% END %]
 
 
-[%- BLOCK renderFullJobsetName -%]
+[% BLOCK renderFullJobsetName %]
 <tt>[% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %]</tt>
-[%- END -%]
+[% END %]
 
 
-[%- BLOCK renderFullJobName -%]
+[% BLOCK renderFullJobName %]
 <tt>[% IF !hideProjectName; INCLUDE renderProjectName %]:[% END; IF !hideJobsetName; INCLUDE renderJobsetName %]:[% END; INCLUDE renderJobName %]</tt>
-[%- END %]
+[% END %]
 
 
-[%- BLOCK renderFullJobNameOfBuild -%]
+[% BLOCK renderFullJobNameOfBuild %]
   [% INCLUDE renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.get_column("job") %]
 [% END %]
 
 
-[%- BLOCK renderDuration -%]
+[% BLOCK renderDuration %]
 [% IF duration >= 24 * 60 * 60 %][% duration div (24 * 60 * 60) %]d[% END %]
 [% IF duration >= 60 * 60 %][% duration div (60 * 60) % 24 %]h[% END %]
 [% IF duration >= 60 %][% duration div 60 % 60 %]m[% END %]
@@ -59,98 +59,98 @@
 [% END %]
 
 
-[%- BLOCK renderBuildListHeader -%]
+[% BLOCK renderBuildListHeader %]
   <table class="buildList table table-striped table-condensed [% IF !unsortable %]tablesorter[% END %] [% IF !showSchedulingInfo %] clean[% END %]">
     <thead>
       <tr>
-        [%- IF !hideResultInfo -%]
+        [% IF !hideResultInfo %]
           <th></th>
         [% END %]
-        [%- IF showSchedulingInfo -%]
+        [% IF showSchedulingInfo %]
           <th></th>
-        [%- END -%]
+        [% END %]
         <th>#</th>
-        [%- IF showSchedulingInfo -%]
+        [% IF showSchedulingInfo %]
           <th>P</th>
-        [%- END -%]
-        [%- IF !hideJobName -%]
+        [% END %]
+        [% IF !hideJobName %]
         <th>Job</th>
-        [%- END -%]
+        [% END %]
         <th>Release Name</th>
         <th>System</th>
         <th>Timestamp</th>
-        [%- IF showStatusChange -%]
+        [% IF showStatusChange %]
           <th class="headerSortUp">Last status change</th>
-        [%- END -%]
-        [%- IF showDescription -%]
+        [% END %]
+        [% IF showDescription %]
           <th>Description</th>
-        [%- END -%]
+        [% END %]
       </tr>
     </thead>
     <tbody>
-[%- END -%]
+[% END %]
 
-[%- BLOCK renderBuildListBody -%]
-      [%- odd = 0 -%]
-      [%- FOREACH build IN builds -%]
+[% BLOCK renderBuildListBody %]
+      [% odd = 0 %]
+      [% FOREACH build IN builds %]
         <tr class="clickable
-                   [%- IF showSchedulingInfo -%]
-                     [%- IF build.busy %]runningBuild[% ELSIF build.disabled == 1 || build.get_column('enabled') == 0 %]disabledBuild[% END -%]
-                   [%- ELSE -%]
-                     [%- IF odd %] odd [% END; odd = !odd -%]
-                   [%- END %]"
+                   [% IF showSchedulingInfo %]
+                     [% IF build.busy %]runningBuild[% ELSIF build.disabled == 1 || build.get_column('enabled') == 0 %]disabledBuild[% END %]
+                   [% ELSE %]
+                     [% IF odd %] odd [% END; odd = !odd %]
+                   [% END %]"
             onclick="if(event.which == 2) return true; window.location = '[% c.uri_for('/build' build.id) %]'">
-          [%- IF !hideResultInfo -%]
+          [% IF !hideResultInfo %]
             <td>
-              [%- INCLUDE renderBuildStatusIcon size=16 busy=(showSchedulingInfo ? 1 : 0) buildstatus=build.buildstatus -%]
+              [% INCLUDE renderBuildStatusIcon size=16 busy=(showSchedulingInfo ? 1 : 0) buildstatus=build.buildstatus %]
             </td>
-          [%- END -%]
+          [% END %]
           [% IF showSchedulingInfo %]
-              <td>[%- IF build.busy %]<span class="label label-success">Started</span>[% ELSE %]<span class="label">Queued</span>[% END %]</td>
+              <td>[% IF build.busy %]<span class="label label-success">Started</span>[% ELSE %]<span class="label">Queued</span>[% END %]</td>
           [% END %]
           <td><a href="[% c.uri_for('/build' build.id) %]">[% build.id %]</a></td>
-          [%- IF showSchedulingInfo -%]
+          [% IF showSchedulingInfo %]
             <td>[% build.priority %]</td>
-          [%- END -%]
-          [%- IF !hideJobName -%]
-          <td>[%- INCLUDE renderFullJobNameOfBuild -%]</td>
-          [%- END -%]
+          [% END %]
+          [% IF !hideJobName %]
+          <td>[% INCLUDE renderFullJobNameOfBuild %]</td>
+          [% END %]
           <td>[% !showSchedulingInfo and build.get_column('releasename') ? build.get_column('releasename') : build.nixname %]</td>
           <td><tt>[% build.system %]</tt></td>
           <td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>
-          [%- IF showStatusChange -%]
+          [% IF showStatusChange %]
           <td>
-            [%- IF build.get_column('statusChangeTime') -%]
+            [% IF build.get_column('statusChangeTime') %]
               <a href="[% c.uri_for('/build' build.get_column('statusChangeId')) %]">
                 [% date.format(build.get_column('statusChangeTime'), '%Y-%m-%d %H:%M:%S') %]
               </a>
-            [%- ELSE -%]
+            [% ELSE %]
               <em>never</em>
-            [%- END -%]
+            [% END %]
           </td>
-        [%- END -%]
-        [%- IF showDescription -%]
+        [% END %]
+        [% IF showDescription %]
           <td>[% build.description %]</td>
-        [%- END -%]
+        [% END %]
         </tr>
-      [%- END -%]
-[%- END -%]
+      [% END %]
+[% END %]
 
-[%- BLOCK renderBuildListFooter -%]
+[% BLOCK renderBuildListFooter %]
     </tbody>
   </table>
-[%- END -%]
+[% END %]
 
-[%- BLOCK renderBuildList -%]
-[%- INCLUDE renderBuildListHeader -%]
-[%- INCLUDE renderBuildListBody -%]
-[%- INCLUDE renderBuildListFooter -%]
-[%- END -%]
+[% BLOCK renderBuildList %]
+[% INCLUDE renderBuildListHeader %]
+[% INCLUDE renderBuildListBody %]
+[% INCLUDE renderBuildListFooter %]
+[% END %]
 
 
-[%- BLOCK renderLink -%]<a href="[% uri %]">[% title %]</a>[%- END -%]
+[% BLOCK renderLink %]<a href="[% uri %]">[% title %]</a>[% END %]
 
-[%- BLOCK showBuildStats -%]
+[% BLOCK showBuildStats %]
 
   <table class="layoutTable">
     <tr>
@@ -179,21 +179,21 @@
     </tr>
   </table>
 
-[%- END -%]
+[% END %]
 
 
-[% BLOCK renderViewJobName -%]
-[% IF job.description; HTML.escape(job.description); ELSE %]<tt>[% job.job %]</tt> ([% job.attrs %])[% END -%]
-[% END -%]
+[% BLOCK renderViewJobName %]
+[% IF job.description; HTML.escape(job.description); ELSE %]<tt>[% job.job %]</tt> ([% job.attrs %])[% END %]
+[% END %]
 
 
-[% BLOCK maybeLink -%]
-  [% IF uri %]<a [% HTML.attributes(href => uri, class => class) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %]</a>[% ELSE; content; END -%]
-[% END -%]
+[% BLOCK maybeLink %]
+  [% IF uri %]<a [% HTML.attributes(href => uri, class => class) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %]</a>[% ELSE; content; END %]
+[% END %]
 
-[% BLOCK maybeButton -%]
-  [% IF uri %]<a class="btn btn-mini" [% HTML.attributes(href => uri) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %]</a>[% ELSE; content; END -%]
-[% END -%]
+[% BLOCK maybeButton %]
+  [% IF uri %]<a class="btn btn-mini" [% HTML.attributes(href => uri) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %]</a>[% ELSE; content; END %]
+[% END %]
 
 [% BLOCK renderSelection %]
   [% IF edit %]
@@ -222,43 +222,43 @@
 
 
 [% BLOCK maybeEditString;
-  IF edit -%]
+  IF edit %]
     <input type="text" class="string [% extraClass %]" [% HTML.attributes(id => param, name => param, value => value) %] />
   [% ELSE;
     HTML.escape(value);
-  END -%]
-[% END -%]
-
-[% BLOCK renderFullBuildLink %]
-[% INCLUDE renderFullJobNameOfBuild build=build %] <a href="[% c.uri_for('/build' build.id) %]">build [% build.id %]</a>[% -%]
+  END %]
 [% END %]
 
-[%- BLOCK renderBuildStatusIcon -%]
-  [%- finished = build != undef ? build.finished : 1 -%]
-  [%- busy = busy != undef ? busy : build.busy -%]
-  [%- buildstatus = buildstatus != undef ? buildstatus : build.buildstatus -%]
-  [%- IF finished -%]
-    [%- IF buildstatus == 0 -%]
+[% BLOCK renderFullBuildLink %]
+[% INCLUDE renderFullJobNameOfBuild build=build %] <a href="[% c.uri_for('/build' build.id) %]">build [% build.id %]</a>[% %]
+[% END %]
+
+[% BLOCK renderBuildStatusIcon %]
+  [% finished = build != undef ? build.finished : 1 %]
+  [% busy = busy != undef ? busy : build.busy %]
+  [% buildstatus = buildstatus != undef ? buildstatus : build.buildstatus %]
+  [% IF finished %]
+    [% IF buildstatus == 0 %]
       <img src="/static/images/checkmark_[% size %].png" alt="Succeeded" />
-    [%- ELSIF buildstatus == 1 -%]
+    [% ELSIF buildstatus == 1 %]
       <img src="/static/images/error_[% size %].png" alt="Failed" />
-    [%- ELSIF buildstatus == 2 -%]
+    [% ELSIF buildstatus == 2 %]
       <img src="/static/images/dependency_[% size %].png" alt="Dependency failed" />
-    [%- ELSIF buildstatus == 4 -%]
+    [% ELSIF buildstatus == 4 %]
       <img src="/static/images/cancelled_[% size %].png" alt="Cancelled" />
-    [%- ELSIF buildstatus == 5 -%]
+    [% ELSIF buildstatus == 5 %]
       <img src="/static/images/error_[% size %].png" alt="Failed" />
-    [%- ELSIF buildstatus == 6 -%]
+    [% ELSIF buildstatus == 6 %]
       <img src="/static/images/error_[% size %].png" alt="Failed (with result)" />
-    [%- ELSE -%]
+    [% ELSE %]
       <img src="/static/images/error_[% size %].png" alt="Failed" />
-    [%- END -%]
-  [%- ELSIF busy -%]
+    [% END %]
+  [% ELSIF busy %]
     <img src="/static/images/help_[% size %].png" alt="Busy" />
-  [%- ELSE -%]
+  [% ELSE %]
     <img src="/static/images/help_[% size %].png" alt="Scheduled" />
-  [%- END -%]
-[%- END -%]
+  [% END %]
+[% END %]
 
 [% BLOCK renderStatus %]
   [% IF build.finished %]
@@ -286,7 +286,7 @@
   [% ELSE %]
     <strong>Scheduled to be built</strong>
   [% END %]
-[% END -%]
+[% END %]
 
 [% BLOCK renderInputValue %]
     [% IF input.type == "build" || input.type == "sysbuild" %]
@@ -415,17 +415,17 @@
 [% END %]
 
 
-[% BLOCK renderShortEvalInput -%]
-  [%- IF input.type == "svn" || input.type == "svn-checkout" || input.type == "bzr" || input.type == "bzr-checkout" -%]
-    r[%- input.revision -%]
-  [%- ELSIF input.type == "git" -%]
+[% BLOCK renderShortEvalInput %]
+  [% IF input.type == "svn" || input.type == "svn-checkout" || input.type == "bzr" || input.type == "bzr-checkout" %]
+    r[% input.revision %]
+  [% ELSIF input.type == "git" %]
     <tt>[% input.revision.substr(0, 7) %]</tt>
-  [%- ELSIF input.type == "build" || input.type == "sysbuild" -%]
+  [% ELSIF input.type == "build" || input.type == "sysbuild" %]
     <tt>[% input.dependency.id %]</tt>
-  [%- ELSE -%]
-    <tt>[%- input.revision -%]</tt>
-  [%- END -%]
-[%- END %]
+  [% ELSE %]
+    <tt>[% input.revision %]</tt>
+  [% END %]
+[% END %]
 
 
 [% BLOCK renderEvals %]
@@ -439,19 +439,19 @@
     </tr>
   </thead>
   <tbody>
-    [%- FOREACH e IN evals; eval = e.eval;
-        link = c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) -%]
+    [% FOREACH e IN evals; eval = e.eval;
+        link = c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) %]
      <tr class="clickable" onclick="window.location = '[% link %]'">
        <td><a href="[% link %]">[% eval.id %]</a>&nbsp;</td>
        <td>[% INCLUDE renderDateTime timestamp = eval.timestamp %]&nbsp;</td>
        <td>
-         [%- IF e.changedInputs.size > 0 -%]
-           [%- sep=''; FOREACH input IN e.changedInputs -%]
-             [%- sep %] [% input.name %] → [% INCLUDE renderShortEvalInput input=input %]
-           [%- sep=','; END -%]
-         [%- ELSE -%]
+         [% IF e.changedInputs.size > 0 %]
+           [% sep=''; FOREACH input IN e.changedInputs %]
+             [% sep %] [% input.name %] → [% INCLUDE renderShortEvalInput input=input %]
+           [% sep=','; END %]
+         [% ELSE %]
            -
-         [%- END -%]
+         [% END %]
        </td>
        <td align='right'>
          <span class="label label-success">[% e.nrSucceeded %]</span>
@@ -461,17 +461,17 @@
          [% END %]
        </td>
        <td align='right'>
-         [%- IF e.diff > 0 -%]
+         [% IF e.diff > 0 %]
             <span class='label label-success'><strong>+[% e.diff %]</strong></span>
-         [%- ELSIF e.diff < 0 && e.nrScheduled == 0 -%]
+         [% ELSIF e.diff < 0 && e.nrScheduled == 0 %]
             <span class='label label-important'><strong>[% e.diff %]</strong></span>
-         [%- END -%]
+         [% END %]
        </td>
      </tr>
-    [%- END -%]
-    [%- IF linkToAll -%]
+    [% END %]
+    [% IF linkToAll %]
       <tr><td class="centered" colspan=54"><a href="[% linkToAll %]"><em>More...</em></a></td></tr>
-    [%- END -%]
+    [% END %]
   </tbody>
 </table>
 [% END %]
diff --git a/src/root/contextbar.tt b/src/root/contextbar.tt
index e1524bf4..352fc1e4 100644
--- a/src/root/contextbar.tt
+++ b/src/root/contextbar.tt
@@ -5,8 +5,8 @@
   </li>
 [% END %]
 
-[% BLOCK makeLink -%]
-[% INCLUDE makeLinkWrapped content="" -%]
+[% BLOCK makeLink %]
+[% INCLUDE makeLinkWrapped content="" %]
 [% END %]
 
 [% BLOCK makeSubMenu %]
diff --git a/src/root/jobset-eval.tt b/src/root/jobset-eval.tt
index 65f2c24a..0a80ca32 100644
--- a/src/root/jobset-eval.tt
+++ b/src/root/jobset-eval.tt
@@ -3,15 +3,15 @@
 
 <div class="page-header"><h1>Jobset <tt>[% project.name %]:[% jobset.name %]</tt> evaluation [% eval.id %]</h1></div>
 
-[%- IF otherEval -%]
+[% IF otherEval %]
 <p>Comparisons are relative to [% INCLUDE renderFullJobsetName
 project=otherEval.jobset.project.name jobset=otherEval.jobset.name %]
 evaluation <a href="[%
 c.uri_for(c.controller('JobsetEval').action_for('view'),
 [otherEval.id]) %]">[% otherEval.id %]</a>.</p>
-[%- END -%]
+[% END %]
 
-[%- BLOCK renderSome -%]
+[% BLOCK renderSome %]
   [% size = builds.size; max = full ? size : 30; %]
   [% INCLUDE renderBuildListBody builds=builds.slice(0, (size > max ? max : size) - 1)
        hideProjectName=1 hideJobsetName=1 %]
@@ -35,13 +35,13 @@ c.uri_for(c.controller('JobsetEval').action_for('view'),
 [% IF removed.size > 0 %]
   <tr><th class="subheader" colspan="6"><strong>Removed</strong> jobs</th></tr>
   [% size = removed.size; max = full ? size : 30; %]
-  [%- FOREACH j IN removed.slice(0,(size > max ? max : size) - 1) -%]
+  [% FOREACH j IN removed.slice(0,(size > max ? max : size) - 1) %]
     <tr>
       <td colspan="2"></td>
       <td colspan="2">[% INCLUDE renderJobName project=project.name jobset=jobset.name job=j.job %]</td>
       <td colspan="2"><tt>[% j.system %]</tt></td>
     </tr>
-  [%- END -%]
+  [% END %]
   [% IF size > max; params = c.req.params; params.full = 1 %]
   <tr><td class="centered" colspan="6"><a href="[% c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id], params) %]"><em>([% size - max %] more jobs omitted)</em></a></td></tr>
   [% END %]
diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index 5128844c..07d88355 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -26,14 +26,14 @@
 
   <tr class="input [% extraClass %]" [% IF id %]id="[% id %]"[% END %]>
     <td>
-      [% IF edit %]<button type="button" class="btn btn-warning" onclick='$(this).parents(".input").remove()'><i class="icon-trash icon-white"></i></button>[% END -%]
+      [% IF edit %]<button type="button" class="btn btn-warning" onclick='$(this).parents(".input").remove()'><i class="icon-trash icon-white"></i></button>[% END %]
       <tt>[% INCLUDE maybeEditString param="$baseName-name" value=input.name extraClass="shortString" %]</tt>
     </td>
     <td>
       [% INCLUDE renderSelection curValue=input.type param="$baseName-type" options=inputTypes %]
     </td>
     <td class="inputalts" id="[% baseName %]">
-      [% FOREACH alt IN input.jobsetinputalts -%]
+      [% FOREACH alt IN input.jobsetinputalts %]
         <tt class="inputalt">
           [% IF input.type == "string" && !edit %]
             "[% HTML.escape(alt.value) %]"
@@ -57,7 +57,7 @@
                     <tr><th>Input name</th><th>Type</th><th>Values</th></tr>
                   </thead>
                   <tbody class="inputs">
-                    [% FOREACH input IN jobset.jobsetinputs -%]
+                    [% FOREACH input IN jobset.jobsetinputs %]
                       [% INCLUDE renderInput input=input baseName="input-$input.name" %]
                     [% END %]
                     [% IF edit %]
@@ -72,9 +72,9 @@
 
 
         <ul id="tab" class="nav nav-tabs">
-                [% IF !edit -%]
+                [% IF !edit %]
                         <li><a href="#tabs-information" data-toggle="tab">Jobset</a></li>
-                [% IF jobset.errormsg -%]<li><a href="#tabs-errors" data-toggle="tab"><img src="/static/images/error_16.png" /> Evaluation errors</a></li>[% END %]
+                [% IF jobset.errormsg %]<li><a href="#tabs-errors" data-toggle="tab"><img src="/static/images/error_16.png" /> Evaluation errors</a></li>[% END %]
                         <li><a href="#tabs-jobs" data-toggle="tab">Jobs ([% activeJobs.size %])</a></li>
                 [% END %]
                 <li><a href="#tabs-setup" data-toggle="tab">Setup</a></li>
@@ -82,18 +82,18 @@
 
 <div id="generic-tabs" class="tab-content">
         <div id="tabs-information" class="tab-pane active">
-                [% IF !edit && evals.size() > 0 -%]
+                [% IF !edit && evals.size() > 0 %]
                     <h2>Most recent evaluations</h2>
                     [% INCLUDE renderEvals linkToAll=c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name]) %]
                 [% END %]
-                [% IF !edit && activeJobsStatus -%]
+                [% IF !edit && activeJobsStatus %]
                     <h2>Status</h2>
                     <table class="table table-striped table-condensed">
                       <thead><tr><th>Job</th>[% FOREACH s IN systems %]<th>[% s.system %]</th>[% END %]</tr></thead>
                       <tbody>
                 [% odd = 0 %]
                         [% FOREACH j IN activeJobsStatus %]
-                          <tr class="[% IF odd %] odd [% END; odd = !odd -%]">
+                          <tr class="[% IF odd %] odd [% END; odd = !odd %]">
                              <td>[% INCLUDE renderJobName project=project.name jobset = jobset.name job = j.get_column('job') %]</td>
                              [% FOREACH s IN systems %]
                        [% system = s.system %]
@@ -111,7 +111,7 @@
                       </tbody>
                     </table>
                 [% END %]
-                [% IF !edit && !activeJobsStatus -%]
+                [% IF !edit && !activeJobsStatus %]
                     <h2>Status</h2>
                         <p>
                                 [ <a href="[% c.uri_for('/jobset' project.name jobset.name 'with-status' ) %]">Show status overview</a> ]
@@ -119,9 +119,9 @@
                 [% END %]
 
         </div>
-        [% IF !edit -%]
+        [% IF !edit %]
 
-                [% IF jobset.errormsg -%]
+                [% IF jobset.errormsg %]
                 <div id="tabs-errors" class="tab-pane">
                   <h2>Evaluation errors</h2>
                   <p>
@@ -181,7 +181,7 @@
                             <th>Last checked:</th>
                             <td>
                               [% IF jobset.lastcheckedtime %]
-                                [% INCLUDE renderDateTime timestamp = jobset.lastcheckedtime -%][% IF jobset.errormsg -%]<em>, with errors!</em>
+                                [% INCLUDE renderDateTime timestamp = jobset.lastcheckedtime %][% IF jobset.errormsg %]<em>, with errors!</em>
                                 [% ELSE %], <em>no errors</em>
                                 [% END %]
                               [% ELSE %]
@@ -195,7 +195,7 @@
 
                         [% INCLUDE renderInputs %]
                 </div>
-        [% IF !edit -%]
+        [% IF !edit %]
                 <div id="tabs-jobs" class="tab-pane">
 
                         <h2>Jobs</h2>
diff --git a/src/root/layout.tt b/src/root/layout.tt
index 6311335e..6af6cf9e 100644
--- a/src/root/layout.tt
+++ b/src/root/layout.tt
@@ -1,5 +1,5 @@
-[% USE date -%]
-[% USE HTML -%]
+[% USE date %]
+[% USE HTML %]
 <?xml version="1.0" encoding="UTF-8"?>
 
 [% PROCESS common.tt %]
diff --git a/src/root/log.tt b/src/root/log.tt
index be1711ac..78c11ed5 100644
--- a/src/root/log.tt
+++ b/src/root/log.tt
@@ -11,7 +11,7 @@
 </p>
 
 <div class="buildlog">
-[% logtext -%]
+[% logtext %]
 </div>
 
 [% END %]
diff --git a/src/root/plain-reload.tt b/src/root/plain-reload.tt
index c9db1102..f078b6aa 100644
--- a/src/root/plain-reload.tt
+++ b/src/root/plain-reload.tt
@@ -19,7 +19,7 @@
 [% END %]
 
 <pre class="taillog" id="contents">
-[% HTML.escape(contents) -%]
+[% HTML.escape(contents) %]
 </pre>
 
 [% END %]
diff --git a/src/root/plain.tt b/src/root/plain.tt
index 110074e8..bb6c09cb 100644
--- a/src/root/plain.tt
+++ b/src/root/plain.tt
@@ -8,7 +8,7 @@
 <div class="page-header"><h1>[% title %]</h1></div>
 
 <div class="buildlog">
-[% contents -%]
+[% contents %]
 </div>
 
 [% END %]
diff --git a/src/root/product-list.tt b/src/root/product-list.tt
index 33282751..61b7c4de 100644
--- a/src/root/product-list.tt
+++ b/src/root/product-list.tt
@@ -1,10 +1,10 @@
 [% USE mibs=format("%.2f") %]
 
-[% BLOCK renderProductList -%]
+[% BLOCK renderProductList %]
 
   <table class="productList layoutTable">
 
-    [% FOREACH product IN build.buildproducts -%]
+    [% FOREACH product IN build.buildproducts %]
 
       [% uri = "${c.uri_for('/build' build.id 'download' product.productnr)}"
           _ (product.name ? "/" _ product.name : "")
@@ -214,7 +214,7 @@
 
       [% END %]
 
-    [% END -%]
+    [% END %]
 
   </table>
 
diff --git a/src/root/timeline.tt b/src/root/timeline.tt
index dca332f9..f380898c 100644
--- a/src/root/timeline.tt
+++ b/src/root/timeline.tt
@@ -41,7 +41,7 @@ Timeline_urlPrefix="http://simile.mit.edu/timeline/api/";
             "title": "Now"
           }
 
-     [% FOREACH build IN builds -%]
+     [% FOREACH build IN builds %]
           , { "start": "[% date.format(build.get_column("starttime"), '%Y-%m-%dT%H:%M:%S')  %]",
               "end": "[% date.format(build.get_column("stoptime"), '%Y-%m-%dT%H:%M:%S') %]",
               "isDuration": "true",
diff --git a/src/root/topbar.tt b/src/root/topbar.tt
index 6404448b..3446420f 100644
--- a/src/root/topbar.tt
+++ b/src/root/topbar.tt
@@ -5,8 +5,8 @@
   </li>
 [% END %]
 
-[% BLOCK makeLink -%]
-[% INCLUDE makeLinkWrapped content="" -%]
+[% BLOCK makeLink %]
+[% INCLUDE makeLinkWrapped content="" %]
 [% END %]
 
 [% BLOCK makeSubMenu %]
@@ -26,8 +26,8 @@
   </li>
 [% END %]
 
-[% BLOCK makeLink -%]
-[% INCLUDE makeLinkWrapped content="" -%]
+[% BLOCK makeLink %]
+[% INCLUDE makeLinkWrapped content="" %]
 [% END %]
 
 
diff --git a/src/root/view-result.tt b/src/root/view-result.tt
index 12ad2a20..6852f751 100644
--- a/src/root/view-result.tt
+++ b/src/root/view-result.tt
@@ -1,4 +1,4 @@
-[% releaseName = (result.releasename || "(No name)") -%]
+[% releaseName = (result.releasename || "(No name)") %]
 [% WRAPPER layout.tt title="View $releaseName" %]
 [% PROCESS common.tt %]
 [% PROCESS "product-list.tt" %]