diff --git a/admin.php b/admin.php
deleted file mode 100644
index 31b3f26..0000000
--- a/admin.php
+++ /dev/null
@@ -1,537 +0,0 @@
-<?php
-/**
- * Administrative UI and helpers for Mercator
- *
- * @package Mercator
- */
-
-namespace Mercator\Admin;
-
-use Mercator\Mapping;
-use WP_Error;
-
-add_filter( 'wpmu_blogs_columns',            __NAMESPACE__ . '\\add_site_list_column' );
-add_action( 'manage_sites_custom_column',    __NAMESPACE__ . '\\output_site_list_column', 10, 2 );
-add_action( 'admin_footer',                  __NAMESPACE__ . '\\maybe_output_site_tab' );
-add_action( 'admin_action_mercator-aliases', __NAMESPACE__ . '\\output_list_page' );
-add_action( 'admin_action_mercator-add',     __NAMESPACE__ . '\\output_edit_page' );
-add_action( 'admin_action_mercator-edit',    __NAMESPACE__ . '\\output_edit_page' );
-add_filter( 'plugin_row_meta',               __NAMESPACE__ . '\\output_sunrise_dropin_note', -10, 4 );
-
-/**
- * Add site list column to list
- *
- * @param array $columns Column map of ID => title
- * @return array
- */
-function add_site_list_column( $columns ) {
-	$columns['mercator_aliases'] = __( 'Aliases', 'mercator' );
-	return $columns;
-}
-
-/**
- * Output the site list column
- *
- * @param string $column Column ID
- * @param int $site_id Site ID
- */
-function output_site_list_column( $column, $site_id ) {
-	switch ( $column ) {
-		case 'mercator_aliases':
-			$mappings = Mapping::get_by_site( $site_id );
-			if ( ! empty( $mappings ) ) {
-				foreach ( $mappings as $mapping ) {
-					// Kinda horrible formatting, but matches the existing
-					echo esc_html( $mapping->get_domain() ) . '<br />';
-				}
-			}
-
-			break;
-	}
-}
-
-/**
- * Output the site tab if we're on the right page
- *
- * Outputs the link, then moves it into place using JS, as there are no hooks to
- * speak of.
- */
-function maybe_output_site_tab() {
-	if ( ! is_network_admin() ) {
-		return;
-	}
-
-	if ( $GLOBALS['parent_file'] !== 'sites.php' || $GLOBALS['submenu_file'] !== 'sites.php' ) {
-		return;
-	}
-
-	$id = isset( $_REQUEST['id'] ) ? absint( $_REQUEST['id'] ) : 0;
-	if ( empty( $id ) ) {
-		return;
-	}
-
-	$class = ( ! empty( $_REQUEST['action'] ) && $_REQUEST['action'] === 'mercator-aliases' ) ? ' nav-tab-active' : '';
-
-?>
-	<span id="mercator-aliases-nav-link" class="hide-if-no-js"><a href="<?php echo network_admin_url( 'admin.php?action=mercator-aliases' ) . '&id=' . $id ?>" class="nav-tab<?php echo $class ?>"><?php esc_html_e( 'Aliases', 'mercator' ) ?></a></span>
-	<script>jQuery(function ($) {
-		$( '#mercator-aliases-nav-link' ).appendTo( $( '.nav-tab-wrapper' ) );
-	});</script>
-<?php
-
-}
-
-/**
- * Output the admin page header
- *
- * @param int $id Site ID
- * @param array $messages Messages to display
- */
-function output_page_header( $id, $messages = array() ) {
-	$site_url_no_http = preg_replace( '#^http(s)?://#', '', get_blogaddress_by_id( $id ) );
-	$title_site_url_linked = sprintf( __('Aliases: <a href="%1$s">%2$s</a>'), get_blogaddress_by_id( $id ), $site_url_no_http );
-
-	// Load the page header
-	global $title, $parent_file, $submenu_file;
-	$title = sprintf( __( 'Aliases: %s', 'mercator' ), $site_url_no_http );
-	$parent_file = 'sites.php';
-	$submenu_file = 'sites.php';
-	require_once(ABSPATH . 'wp-admin/admin-header.php');
-
-	$add_link = add_query_arg(
-		array(
-			'action' => 'mercator-add',
-			'id'     => $id,
-		),
-		network_admin_url( 'admin.php' )
-	);
-?>
-
-<div class="wrap">
-	<h2 id="edit-site">
-
-		<?php echo $title_site_url_linked ?>
-
-		<a href="<?php echo esc_url( $add_link ) ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'alias', 'mercator' ) ?></a>
-	</h2>
-	<h3 class="nav-tab-wrapper">
-<?php
-	$tabs = array(
-		'site-info'     => array( 'label' => __( 'Info' ),     'url' => 'site-info.php'     ),
-		'site-users'    => array( 'label' => __( 'Users' ),    'url' => 'site-users.php'    ),
-		'site-themes'   => array( 'label' => __( 'Themes' ),   'url' => 'site-themes.php'   ),
-		'site-settings' => array( 'label' => __( 'Settings' ), 'url' => 'site-settings.php' ),
-	);
-	foreach ( $tabs as $tab_id => $tab ) {
-		$class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
-		echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
-	}
-?>
-	</h3>
-<?php
-	if ( ! empty( $messages ) ) {
-		foreach ( $messages as $msg )
-			echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';
-	}
-}
-
-/**
- * Output the admin page footer
- */
-function output_page_footer() {
-	echo '</div>';
-
-	require_once(ABSPATH . 'wp-admin/admin-footer.php');
-}
-
-/**
- * Handle submission of the list page
- *
- * Handles bulk actions for the list page. Redirects back to itself after
- * processing, and exits.
- *
- * @param int $id Site ID
- * @param string $action Action to perform
- */
-function handle_list_page_submit( $id, $action ) {
-	check_admin_referer( 'mercator-aliases-bulk-' . $id );
-
-	$sendback = remove_query_arg( array( 'did_action', 'mappings', '_wpnonce' ), wp_get_referer() );
-	if ( ! $sendback )
-		$sendback = admin_url( $parent_file );
-
-	$mappings = empty( $_REQUEST['mappings'] ) ? array() : (array) $_REQUEST['mappings'];
-	$mappings = array_map( 'absint', $mappings );
-
-	if ( ! isset( $mappings ) ) {
-		wp_redirect( $sendback );
-		exit;
-	}
-
-	$processed = 0;
-	$args = array(
-		'did_action' => $action,
-		'mappings'   => join( ',', $mappings ),
-	);
-	switch ( $action ) {
-		case 'activate':
-			foreach ( $mappings as $id ) {
-				$mapping = Mapping::get( $id );
-				if ( is_wp_error( $mapping ) ) {
-					continue;
-				}
-
-				if ( $mapping->set_active( true ) ) {
-					$processed++;
-				}
-			}
-			break;
-
-		case 'deactivate':
-			foreach ( $mappings as $id ) {
-				$mapping = Mapping::get( $id );
-				if ( is_wp_error( $mapping ) ) {
-					continue;
-				}
-
-				if ( $mapping->set_active( false ) ) {
-					$processed++;
-				}
-			}
-			break;
-
-		case 'delete':
-			$args['domains'] = array();
-			foreach ( $mappings as $id ) {
-				$mapping = Mapping::get( $id );
-				if ( is_wp_error( $mapping ) ) {
-					continue;
-				}
-
-				if ( $mapping->delete() ) {
-					// Mappings don't exist after we delete them, so pass the
-					// domain for messages and such
-					$args['domains'][] = $mapping->get_domain();
-					$processed++;
-				}
-			}
-			break;
-
-		default:
-			do_action_ref_array( "mercator_aliases_bulk_action-{$action}", array( $mappings, &$processed, $action ) );
-			break;
-	}
-
-	$args['processed'] = $processed;
-	$sendback = add_query_arg( $args, $sendback );
-
-	wp_safe_redirect( $sendback );
-	exit();
-}
-
-/**
- * Output alias editing page
- */
-function output_list_page() {
-
-	$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
-
-	if ( ! $id )
-		wp_die( __('Invalid site ID.') );
-
-	$id = absint( $id );
-
-	$details = get_blog_details( $id );
-	if ( ! can_edit_network( $details->site_id ) || (int) $details->blog_id !== $id )
-		wp_die( __( 'You do not have permission to access this page.' ) );
-
-	$wp_list_table = new Alias_List_Table( array(
-		'site_id' => $id,
-	) );
-
-	$messages = array();
-
-	$bulk_action = $wp_list_table->current_action();
-	if ( $bulk_action ) {
-		$messages = handle_list_page_submit( $id, $bulk_action );
-	}
-
-	$pagenum = $wp_list_table->get_pagenum();
-
-	$wp_list_table->prepare_items( $id );
-
-	// Add messages for bulk actions
-	if ( ! empty( $_REQUEST['did_action'] ) ) {
-		$processed  = empty( $_REQUEST['processed'] ) ? 0 : absint( $_REQUEST['processed'] );
-		$did_action = $_REQUEST['did_action'];
-
-		$mappings = empty( $_REQUEST['mappings'] ) ? array() : wp_parse_id_list( $_REQUEST['mappings'] );
-		$mappings = array_map( 'absint', $mappings );
-
-		// Special case for single, as it's not really a "bulk" action
-		if ( $processed === 1 ) {
-			$bulk_messages = array(
-				'activate'   => __( 'Activated %s',   'mercator' ),
-				'deactivate' => __( 'Deactivated %s', 'mercator' ),
-				'delete'     => __( 'Deleted %s',     'mercator' ),
-				'add'        => __( 'Created %s',     'mercator' ),
-				'edit'       => __( 'Updated %s',     'mercator' ),
-			);
-			if ( $did_action !== 'delete' ) {
-				$mapping = Mapping::get( $mappings[0] );
-				$domain = $mapping->get_domain();
-			}
-			else {
-				$domain = empty( $_REQUEST['domains'] ) ? array() : $_REQUEST['domains'][0];
-			}
-			$placeholder = '<code>' . $domain . '</code>';
-		}
-		else {
-			// Note: we still use _n for languages which have special cases on
-			// e.g. 3, 5, 10, etc
-			$bulk_messages = array(
-				'activate'   => _n( '%s alias activated.',   '%s aliases activated.',  $processed ),
-				'deactivate' => _n( '%s alias deactivated.', '%s aliases deactiaved.', $processed ),
-				'delete'     => _n( '%s alias deleted.',     '%s aliases deleted.',    $processed ),
-				'add'        => _n( '%s alias created.',     '%s aliases created.',    $processed ),
-				'edit'       => _n( '%s alias updated.',     '%s aliases updated.',    $processed ),
-			);
-			$placeholder = number_format_i18n( $processed );
-		}
-		$bulk_messages = apply_filters( 'mercator_aliases_bulk_messages', $bulk_messages, $processed );
-
-		if ( ! empty( $bulk_messages[ $did_action ] ) ) {
-			$messages[] = sprintf( $bulk_messages[ $did_action ], $placeholder );
-		}
-	}
-
-	output_page_header( $id, $messages );
-
-?>
-	<form method="post" action="admin.php?action=mercator-aliases">
-		<?php $wp_list_table->display(); ?>
-	</form>
-<?php
-	output_page_footer();
-
-}
-
-/**
- * Validate alias parameters
- *
- * @param array $params Raw input parameters
- * @param boolean $check_permission Should we check that the user can edit the network?
- * @return array|WP_Error Validated parameters on success, WP_Error otherwise
- */
-function validate_alias_parameters( $params, $check_permission = true ) {
-	$valid = array();
-
-	// Validate domain
-	if ( empty( $params['domain'] ) ) {
-		return new WP_Error( 'mercator.params.no_domain', __( 'Aliases require a domain name', 'mercator' ) );
-	}
-
-	if ( ! preg_match( '#^[a-z0-9\-.]+$#i', $params['domain'] ) ) {
-		return new WP_Error( 'mercator.params.domain_invalid_chars', __( 'Domains can only contain alphanumeric characters, dashes (-) and periods (.)', 'mercator' ) );
-	}
-
-	$valid['domain'] = $params['domain'];
-
-	// Validate site ID
-	$valid['site']   = absint( $params['id'] );
-	if ( empty( $valid['site'] ) ) {
-		return new WP_Error( 'mercator.params.invalid_site', __( 'Invalid site ID', 'mercator' ) );
-	}
-
-	if ( $check_permission ) {
-		$details = get_blog_details( $valid['site'] );
-
-		// Note: site_id is old terminology, referring to the network ID
-		if ( ! can_edit_network( $details->site_id ) ) {
-			return new WP_Error( 'mercator.params.cannot_edit', __( 'You do not have permission to edit this site', 'mercator' ) );
-		}
-	}
-
-	// Validate active flag
-	$valid['active'] = empty( $params['active'] ) ? false : true;
-
-	return $valid;
-}
-
-/**
- * Handle submission of the add page
- *
- * @return array|null List of errors. Issues a redirect and exits on success.
- */
-function handle_edit_page_submit( $id, $mapping ) {
-	$messages = array();
-	if ( empty( $mapping ) ) {
-		$did_action = 'add';
-		check_admin_referer( 'mercator-add-' . $id );
-	}
-	else {
-		$did_action = 'edit';
-		check_admin_referer( 'mercator-edit-' . $mapping->get_id() );
-	}
-
-	// Check that the parameters are correct first
-	$params = validate_alias_parameters( wp_unslash( $_POST ) );
-	if ( is_wp_error( $params ) ) {
-		$messages[] = $params->get_error_message();
-
-		if ( $params->get_error_code() === 'mercator.params.domain_invalid_chars' ) {
-			$messages[] = __( '<strong>Note</strong>: for internationalized domain names, use the ASCII form (e.g, <code>xn--bcher-kva.example</code>)', 'mercator' );
-		}
-
-		return $messages;
-	}
-	if ( empty( $mapping ) ) {
-		// Create the actual mapping
-		$result = $mapping = Mapping::create( $params['site'], $params['domain'], $params['active'] );	
-	}
-	else {
-		// Update our existing
-		$result = $mapping->update( $params );
-	}
-
-	if ( is_wp_error( $result ) ) {
-		$messages[] = $result->get_error_message();
-
-		return $messages;
-	}
-
-	// Success, redirect to alias page
-	$location = add_query_arg(
-		array(
-			'action'     => 'mercator-aliases',
-			'id'         => $id,
-			'did_action' => $did_action,
-			'mappings'   => $mapping->get_id(),
-			'processed'  => 1,
-			'_wpnonce'   => wp_create_nonce( 'mercator-alias-added-' . $mapping->get_id() ),
-		),
-		network_admin_url( 'admin.php' )
-	);
-	wp_safe_redirect( $location );
-	exit;
-}
-
-/**
- * Output alias editing page
- */
-function output_edit_page() {
-
-	$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
-
-	if ( ! $id )
-		wp_die( __('Invalid site ID.') );
-
-	$id = absint( $id );
-
-	$details = get_blog_details( $id );
-	if ( ! can_edit_network( $details->site_id ) || (int) $details->blog_id !== $id )
-		wp_die( __( 'You do not have permission to access this page.' ) );
-
-	// Are we editing?
-	$mapping = null;
-	$form_action = network_admin_url( 'admin.php?action=mercator-add' );
-	if ( ! empty( $_REQUEST['mapping'] ) ) {
-		$mapping_id = absint( $_REQUEST['mapping'] );
-		$mapping = Mapping::get( $mapping_id );
-		if ( is_wp_error( $mapping ) || empty( $mapping ) ) {
-			wp_die( __( 'Invalid alias ID.', 'mercator' ) );
-		}
-
-		$form_action = network_admin_url( 'admin.php?action=mercator-edit' );
-	}
-
-	// Handle form submission
-	$messages = array();
-	if ( ! empty( $_POST['submit'] ) ) {
-		$messages = handle_edit_page_submit( $id, $mapping );
-	}
-
-	output_page_header( $id, $messages );
-
-	if ( empty( $mapping ) || ! empty( $_POST['_wpnonce'] ) ) {
-		$domain = empty( $_POST['domain'] ) ? '' : wp_unslash( $_POST['domain'] );
-		$active = ! empty( $_POST['active'] );
-	}
-	else {
-		$domain = $mapping->get_domain();
-		$active = $mapping->is_active();
-	}
-
-?>
-	<form method="post" action="<?php echo esc_url( $form_action ) ?>">
-		<table class="form-table">
-			<tr>
-				<th scope="row">
-					<label for="mercator-domain"><?php echo esc_html_x( 'Domain Name', 'field name', 'mercator' ) ?></label>
-				</th>
-				<td>
-					<input type="text" class="regular-text code"
-						name="domain" id="mercator-domain"
-						value="<?php echo esc_attr( $domain ) ?>" />
-				</td>
-			</tr>
-			<tr>
-				<th scope="row">
-					<?php echo esc_html_x( 'Active', 'field name', 'mercator' ) ?>
-				</th>
-				<td>
-					<label>
-						<input type="checkbox"
-							name="active" <?php checked( $active ) ?> />
-
-						<?php esc_html_e( 'Mark alias as active', 'mercator' ) ?>
-					</label>
-				</td>
-			</tr>
-		</table>
-
-		<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
-		<?php
-
-		if ( empty( $mapping ) ) {
-			wp_nonce_field( 'mercator-add-' . $id );
-			submit_button( __( 'Add Alias', 'mercator' ) );
-		}
-		else {
-			echo '<input type="hidden" name="mapping" value="' . esc_attr( $mapping->get_id() ) . '" />';
-			wp_nonce_field( 'mercator-edit-' . $mapping->get_id() );
-			submit_button( __( 'Save Alias', 'mercator' ) );
-		}
-
-		?>
-	</form>
-<?php
-	output_page_footer();
-
-}
-
-/**
- * Add note to sunrise.php on dropins list about Mercator
- *
- * @param array $meta Meta links
- * @param string $file Plugin filename (sunrise.php for sunrise)
- * @param array $data Data from the plugin header
- * @param string $status Status of the plugin
- * @return array Modified meta links
- */
-function output_sunrise_dropin_note( $meta, $file, $data, $status ) {
-	if ( $file !== 'sunrise.php' || $status !== 'dropins' ) {
-		return $meta;
-	}
-
-	$note = '<em>' . sprintf(
-		__( 'Enhanced by <a href="%s" title="%s">Mercator</a>', 'mercator' ),
-		'https://github.com/humanmade/Mercator',
-		sprintf(
-			__( 'Version %s', 'mercator' ),
-			\Mercator\VERSION
-		)
-	) . '</em>';
-	array_unshift( $meta, $note );
-	return $meta;
-}
diff --git a/inc/admin/class-alias-list-table.php b/inc/admin/class-alias-list-table.php
deleted file mode 100644
index bd66fc2..0000000
--- a/inc/admin/class-alias-list-table.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * List table for aliases
- *
- * @package Mercator
- */
-
-namespace Mercator\Admin;
-
-use Mercator\Mapping;
-use WP_List_Table;
-
-/**
- * List table for aliases
- */
-class Alias_List_Table extends WP_List_Table {
-	/**
-	 * Prepare items for the list table
-	 */
-	public function prepare_items() {
-		$this->items = array();
-
-		if ( empty( $this->_args['site_id'] ) ) {
-			return;
-		}
-
-		$id = $this->_args['site_id'];
-		$mappings = Mapping::get_by_site( $id );
-		if ( is_wp_error( $mappings ) ) {
-			\Mercator\warn_with_message( __( 'Could not fetch aliases for the site. This may indicate a database error.', 'mercator' ) );
-		}
-		if ( ! empty( $mappings ) ) {
-			$this->items = $mappings;
-		}
-	}
-
-	/**
-	 * Get columns for the table
-	 *
-	 * @return array Map of column ID => title
-	 */
-	public function get_columns() {
-		return array(
-			'cb'     => '<input type="checkbox" />',
-			'domain' => _x( 'Domain', 'mercator' ),
-			'active' => _x( 'Active', 'mercator' ),
-		);
-	}
-
-	/**
-	 * Get an associative array ( option_name => option_title ) with the list
-	 * of bulk actions available on this table.
-	 *
-	 * @since 3.1.0
-	 * @access protected
-	 *
-	 * @return array
-	 */
-	protected function get_bulk_actions() {
-		$actions = array(
-			'activate'   => _x( 'Activate', 'mercator' ),
-			'deactivate' => _x( 'Deactivate', 'mercator' ),
-			'delete'     => _x( 'Delete', 'mercator' ),
-		);
-
-		return apply_filters( 'mercator_alias_bulk_actions', $actions );
-	}
-
-	/**
-	 * Display the bulk actions dropdown.
-	 *
-	 * @since 3.1.0
-	 * @access protected
-	 *
-	 * @param string $which The location of the bulk actions: 'top' or 'bottom'.
-	 *                      This is designated as optional for backwards-compatibility.
-	 */
-	protected function bulk_actions( $which = '' ) {
-		if ( is_null( $this->_actions ) ) {
-			$no_new_actions = $this->_actions = $this->get_bulk_actions();
-			/**
-			 * Filter the list table Bulk Actions drop-down.
-			 *
-			 * The dynamic portion of the hook name, $this->screen->id, refers
-			 * to the ID of the current screen, usually a string.
-			 *
-			 * This filter can currently only be used to remove bulk actions.
-			 *
-			 * @since 3.5.0
-			 *
-			 * @param array $actions An array of the available bulk actions.
-			 */
-			$this->_actions = apply_filters( "bulk_actions-{$this->screen->id}", $this->_actions );
-			$this->_actions = array_intersect_assoc( $this->_actions, $no_new_actions );
-			$two = '';
-			echo '<input type="hidden" name="id" value="' . $this->_args['site_id'] . '" />';
-			wp_nonce_field( 'mercator-aliases-bulk-' . $this->_args['site_id'] );
-		} else {
-			$two = '2';
-		}
-
-		if ( empty( $this->_actions ) )
-			return;
-
-		echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select bulk action' ) . "</label>";
-		echo "<select name='bulk_action$two' id='bulk-action-selector-" . esc_attr( $which ) . "'>\n";
-		echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n";
-
-		foreach ( $this->_actions as $name => $title ) {
-			$class = 'edit' == $name ? ' class="hide-if-no-js"' : '';
-
-			echo "\t<option value='$name'$class>$title</option>\n";
-		}
-
-		echo "</select>\n";
-
-		submit_button( __( 'Apply' ), 'action', false, false, array( 'id' => "doaction$two" ) );
-		echo "\n";
-	}
-
-	/**
-	 * Get the current action selected from the bulk actions dropdown.
-	 *
-	 * @since 3.1.0
-	 * @access public
-	 *
-	 * @return string|bool The action name or False if no action was selected
-	 */
-	public function current_action() {
-		if ( isset( $_REQUEST['bulk_action'] ) && -1 != $_REQUEST['bulk_action'] )
-			return $_REQUEST['bulk_action'];
-
-		if ( isset( $_REQUEST['bulk_action2'] ) && -1 != $_REQUEST['bulk_action2'] )
-			return $_REQUEST['bulk_action2'];
-
-		return false;
-	}
-
-	/**
-	 * Output extra "navigation" fields (section before/after the table)
-	 *
-	 * Outputs our Add New button above the table
-	 *
-	 * @param string $which Which tablenav to use (top/bottom)
-	 */
-	protected function extra_tablenav( $which ) {
-		global $status;
-
-		if ( $which !== 'top' )
-			return;
-
-		$add_link = add_query_arg(
-			array(
-				'action' => 'mercator-add',
-				'id'     => $this->_args['site_id'],
-			),
-			network_admin_url( 'admin.php' )
-		);
-		echo '<div class="alignright actions">';
-		echo '<a href="' . esc_url( $add_link ) . '" class="button-primary">' . esc_html_x( 'Add New', 'alias', 'mercator' ) . '</a>';
-		echo '</div>';
-	}
-
-	/**
-	 * Get cell value for the checkbox column
-	 *
-	 * @param Mapping $mapping Current mapping item
-	 * @return string HTML for the cell
-	 */
-	protected function column_cb( $mapping ) {
-		return '<label class="screen-reader-text" for="cb-select-' . $mapping->get_id() . '">'
-			. sprintf( __( 'Select %s' ), esc_html( $mapping->get_domain() ) ) . '</label>'
-			. '<input type="checkbox" name="mappings[]" value="' . esc_attr( $mapping->get_id() )
-			. '" id="cb-select-' . esc_attr( $mapping->get_id() ) . '" />';
-	}
-
-	/**
-	 * Get cell value for the domain column
-	 *
-	 * @param Mapping $mapping Current mapping item
-	 * @return string HTML for the cell
-	 */
-	protected function column_domain( $mapping ) {
-		$domain = esc_html( $mapping->get_domain() );
-		if ( substr( $domain, 0, 4 ) === 'www.' ) {
-			$domain = substr( $domain, 4 );
-		}
-
-		$args = array(
-			'action'   => 'mercator-aliases',
-			'id'       => $mapping->get_site_id(),
-			'mappings' => $mapping->get_id(),
-			'_wpnonce' => wp_create_nonce( 'mercator-aliases-bulk-' . $this->_args['site_id'] ),
-		);
-		if ( ! $mapping->is_active() ) {
-			$text = __( 'Activate', 'mercator' );
-			$action = 'activate';
-		}
-		else {
-			$text = __( 'Deactivate', 'mercator' );
-			$action = 'deactivate';
-		}
-		$args['bulk_action'] = $action;
-
-		$link = add_query_arg( $args, network_admin_url( 'admin.php' ) );
-
-		$delete_args = $args;
-		$delete_args['bulk_action'] = 'delete';
-		$delete_link = add_query_arg( $delete_args, network_admin_url( 'admin.php' ) );
-
-		$edit_link = add_query_arg(
-			array(
-				'action'  => 'mercator-edit',
-				'id'      => $mapping->get_site_id(),
-				'mapping' => $mapping->get_id(),
-			),
-			network_admin_url( 'admin.php' )
-		);
-
-		$actions = array(
-			'edit'   => sprintf( '<a href="%s">%s</a>', esc_url( $edit_link ), esc_html__( 'Edit', 'mercator' ) ),
-			$action  => sprintf( '<a href="%s">%s</a>', esc_url( $link ), esc_html( $text ) ),
-			'delete' => sprintf( '<a href="%s" class="submitdelete">%s</a>', esc_url( $delete_link ), esc_html__( 'Delete', 'mercator' ) ),
-		);
-		$actions = apply_filters( 'mercator_alias_actions', $actions, $mapping );
-		$action_html = $this->row_actions( $actions, false );
-
-		return '<strong>' . $domain . '</strong>' . $action_html;
-	}
-
-	/**
-	 * Get cell value for the active column
-	 *
-	 * @param Mapping $mapping Current mapping item
-	 * @return string HTML for the cell
-	 */
-	protected function column_active( $mapping ) {
-		$active = $mapping->is_active();
-		if ( $active ) {
-			return esc_html__( 'Active', 'mercator' );
-		}
-		return esc_html__( 'Inactive', 'mercator');
-	}
-}
diff --git a/mercator.php b/mercator.php
index d34fe5b..61d3a78 100644
--- a/mercator.php
+++ b/mercator.php
@@ -89,7 +89,6 @@ function startup() {
 
 	// Actually hook in!
 	add_filter( 'pre_get_site_by_path', __NAMESPACE__ . '\\check_domain_mapping', 10, 2 );
-	add_action( 'admin_init', __NAMESPACE__ . '\\load_admin', -100 );
 	add_action( 'delete_blog', __NAMESPACE__ . '\\clear_mappings_on_delete' );
 	add_action( 'muplugins_loaded', __NAMESPACE__ . '\\register_mapped_filters', -10 );
 
@@ -222,17 +221,6 @@ function check_table() {
 	return 'created';
 }
 
-/**
- * Load administration functions
- *
- * We do this here rather than just including it to avoid extra load on
- * non-admin pages.
- */
-function load_admin() {
-	require_once __DIR__ . '/admin.php';
-	require_once __DIR__ . '/inc/admin/class-alias-list-table.php';
-}
-
 /**
  * Clear mappings for a site when it's deleted
  *