  
  # If the ticker is running, it will restart and do this, but in case
  # it isn't, make sure everything is in order.
--#
--# TODO: This will have to be a separate program once the database
--# remotable.
+ #
+ # TODO: This will have to be a separate program once the database
+ # remotable.
 -
 -postgresql-load --role '__ROLE__' <<EOF
 -\c pscheduler

+\$\$
 EOF
 
-
-
-[ -t 0 -a -t 1 -a -t 2 ] \
-    && printf " Done.  Hope you meant to do that.\n\n"
-
-
 exit 0

--- a/database/reset.raw
+++ b/database/reset.raw
@@ -37,47 +37,44 @@
 
 
 # Tear down the existing database
-postgresql-load '__DATADIR__/database-teardown.sql'
+cd /
+echo
+sudo -u postgres psql -U postgres <<EOF >/dev/null
+DO \$\$
+BEGIN
