diff --git a/htdocs/roles.php b/htdocs/roles.php
deleted file mode 100644
index d8d161e1..00000000
--- a/htdocs/roles.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-require_once("../inc/always.php");
-require_once("DAViCalSession.php");
-$session->LoginRequired();
-
-require_once("interactive-page.php");
-
-
-  require_once("classBrowser.php");
-  $c->stylesheets[] = "css/browse.css";
-
-  $c->page_title = "System Roles";
-  $browser = new Browser($c->page_title);
-
-  $browser->AddColumn( 'role_no', 'No.', '', '##role_link##' );
-  $browser->AddColumn( 'role_name', 'Name' );
-  $browser->AddHidden( 'role_link', "'<a href=\"/role.php?role_no=' || role_no || '\">' || role_no || '</a>'" );
-
-  $browser->SetJoins( "roles" );
-
-  if ( isset( $_GET['o']) && isset($_GET['d']) ) {
-    $browser->AddOrder( $_GET['o'], $_GET['d'] );
-  }
-  else
-    $browser->AddOrder( 'role_no', 'A' );
-
-  $browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"Click to Display Role Detail\" class=\"r%d\">\n", "</tr>\n", '#even' );
-  $browser->DoQuery();
-
-
-//  if ( $session->AllowedTo("Admin") )
-    $role_menu->AddOption("New Role","/role.php?create","Add a new role", false, 10);
-
-  $active_menu_pattern = "#^/role#";
-
-include("page-header.php");
-
-echo $browser->Render();
-include("page-footer.php");
-?>
diff --git a/htdocs/testpdo.php b/htdocs/testpdo.php
deleted file mode 100644
index f1754fc6..00000000
--- a/htdocs/testpdo.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-require_once("../inc/always.php");
-require_once("DAViCalSession.php");
-$session->LoginRequired();
-
-header('Content-type: text/plain; charset="UTF-8"');
-
-require("AwlQuery.php");
-
-echo "Creating query #1...\n";
-$qry = new AwlQuery('SELECT * FROM collection WHERE is_calendar = :calendarness', array( ':calendarness' => true ) );
-echo "Executing query...\n";
-if ( $qry->Exec() ) {
-  while( $row = $qry->Fetch() ) {
-    printf( '  --> %-50.50s  %s  '."\n", $row->dav_name, $row->resourcetypes );
-  }
-}
-
-echo "Creating query #2...\n";
-$qry = new AwlQuery('SELECT * FROM collection WHERE is_calendar = false');
-echo "Executing query...\n";
-if ( $qry->Exec() ) {
-  while( $row = $qry->Fetch() ) {
-    printf( '  --> %-45.45s  %s  '."\n", $row->dav_name, $row->resourcetypes );
-  }
-}
diff --git a/htdocs/users.php b/htdocs/users.php
deleted file mode 100644
index fc548037..00000000
--- a/htdocs/users.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
-* Display a list of all users
-*
-* @package   davical
-* @subpackage   Admin
-* @author    Andrew McMillan <andrew@catalyst.net.nz>
-* @copyright Catalyst .Net Ltd
-* @license   http://gnu.org/copyleft/gpl.html GNU GPL v2
-*/
-require_once('../inc/always.php');
-require_once('DAViCalSession.php');
-$session->LoginRequired();
-
-require_once('interactive-page.php');
-
-/**
-* Translate relationship names in the relationship_list for each user. See
-* the documentation for classBrowser::BrowserColumn for the definition of
-* the hook function parameters.
-*/
-function translate_relationship_list( $value, $field, $row ) {
-  global $relationship_names;
-  foreach( $relationship_names AS $k => $v ) {
-    $value = str_replace( $k, $v, $value );
-  }
-  return $value;
-}
-
-$relationship_names = array();
-$qry = new PgQuery( 'SELECT rt_name FROM relationship_type' );
-if ( $qry->Exec('users') && $qry->rows > 0 ) {
-  while( $relationship = $qry->Fetch() ) {
-    $relationship_names[$relationship->rt_name] = translate($relationship->rt_name);
-  }
-}
-
-  require_once('classBrowser.php');
-  $c->stylesheets[] = 'css/browse.css';
-  $c->scripts[] = 'js/browse.js';
-
-  $browser = new Browser(translate('Calendar Users'));
-
-  $browser->AddColumn( 'user_no', translate('No.'), 'right', '##user_link##' );
-  $browser->AddColumn( 'username', translate('Name') );
-  $browser->AddHidden( 'user_link', "'<a href=\"$c->base_url/usr.php?user_no=' || user_no || '\">' || user_no || '</a>'" );
-  $browser->AddColumn( 'fullname', translate('Full Name') );
-  $browser->AddColumn( 'email', translate('EMail') );
-  $browser->AddColumn( 'relations', translate('Relationships'), '', '', 'relationship_list(user_no)', '', '', 'translate_relationship_list' );
-  $browser->SetOrdering( 'username', 'A' );
-
-  $browser->SetJoins( 'usr' );
-
-  if ( $c->enable_row_linking ) {
-    $browser->RowFormat( '<tr onMouseover="LinkHref(this,1);" title="'.translate('Click to display user details').'" class="r%d">', '</tr>', '#even' );
-  }
-  else {
-    $browser->RowFormat( '<tr class="r%d">', '</tr>', '#even' );
-  }
-  $browser->DoQuery();
-
-  $c->page_title = translate('Calendar Users');
-
-
-include('page-header.php');
-
-echo $browser->Render();
-
-include('page-footer.php');
diff --git a/htdocs/usr.php b/htdocs/usr.php
deleted file mode 100644
index ddbd3db3..00000000
--- a/htdocs/usr.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-  require_once("../inc/always.php");
-  require_once("DAViCalSession.php");
-
-  // This page requires login.
-  $session->LoginRequired();
-  require_once("interactive-page.php");
-
-  require_once("DAViCalUser.php");
-
-  $user_no = intval(isset($_POST['user_no']) ? $_POST['user_no'] : (isset($_GET['user_no'])?$_GET['user_no']:0) );
-  $user = new DAViCalUser($user_no);
-  if ( 'insert' == $user->WriteType && $user->user_no > 0 ) {
-    $user = new DAViCalUser(0);
-  }
-  if ( $user->user_no == 0 ) {
-    $c->page_title = ( $user_no != "" ? translate("User Unavailable") : translate("New User") );
-  }
-  else {
-    $c->page_title = sprintf("%s (%s)", $user->Get("fullname"), $user->Get("username"));
-  }
-  $show = 0;
-
-  if ( !$session->just_logged_in && (isset($_POST['submit']) || isset($_GET['action'])) ) {
-    if ( $session->AllowedTo("Admin") || $session->AllowedTo("Support")
-              || ($user->user_no > 0 && $user->user_no == $session->user_no) ) {
-      $session->Log( "DBG: Record %s write type is %s.", $user->Table, $user->WriteType );
-      if ( isset($_POST['submit']) ) {
-        $user->PostToValues();
-        if ( $user->Validate() ) {
-          $user->Write();
-          $user = new DAViCalUser($user->user_no);
-          $user->EditMode = true;
-          if ( $user->user_no == 0 ) {
-            $c->page_title = ( $user_no != "" ? translate("User Unavailable") : translate("New User") );
-          }
-          else {
-            $c->page_title = $user->Get("user_no"). " - " . $user->Get("fullname");
-          }
-        }
-      }
-      else {
-        /**
-        * Handle any actions, such as 'delete_relation'
-        */
-        if ( $user->HandleAction($_GET['action']) ) {
-          $user = new DAViCalUser($user->user_no);
-          $user->EditMode = true;
-        }
-      }
-    }
-  }
-
-  $related_menu->AddOption( sprintf(translate("Edit %s"), $user->Get('fullname')), $c->base_url.'/usr.php?user_no='.$user->user_no.'&edit=1', translate("Edit this user record"), true, 900 );
-  $related_menu->AddOption( sprintf(translate("View %s"), $user->Get('fullname')), $c->base_url.'/usr.php?user_no='.$user->user_no, translate("View this user record"), true, 900 );
-  if ( $user->user_no > 0 ) {
-    if ( $user->AllowedTo('update') && ! $user->EditMode ) {
-    	$related_menu->AddOption( sprintf(translate("Edit %s"), $user->Get('fullname')), "$c->base_url/usr.php?user_no=$user->user_no&edit=1", translate("Edit this user record"), true, 900 );
-    }
-    else {
-      $related_menu->AddOption( sprintf(translate("View %s"), $user->Get('fullname')), "$c->base_url/usr.php?user_no=$user->user_no", translate("View this user record"), true, 900 );
-    }
-  }
-
-  include("page-header.php");
-  echo $user->Render($c->page_title);
-  include("page-footer.php");