diff --git a/userqueue.module~ b/userqueue.module~
deleted file mode 100644
index a931c9d..0000000
--- a/userqueue.module~
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-
-/**
- * Implements hook_menu().
- */
-function userqueue_menu() {
-  $items['admin/structure/userqueue'] = array(
-    'title' => 'Userqueue',
-    'page callback' => 'userqueue_list_queues',
-    'description' => 'Create and maintain queues of users',
-    'access arguments' => array('administer userqueues'),
-    'file' => 'userqueue.admin.inc',
-    'type' => MENU_NORMAL_ITEM,
-  );
-
-  $items['admin/structure/userqueue/list'] = array(
-    'title' => 'List',
-    'page callback' => 'userqueue_list_queues',
-    'access arguments' => array('administer userqueues'),
-    'weight' => -1,
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
-
-  $items['admin/structure/userqueue/add'] = array(
-    'title' => 'Add',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('userqueue_edit_form', NULL),
-    'access arguments' => array('administer userqueues'),
-    'file' => 'userqueue.admin.inc',
-    'type' => MENU_LOCAL_TASK,
-  );
-
-  $items['admin/structure/userqueue/%userqueue/delete'] = array(
-    'title' => 'Delete',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('userqueue_admin_delete', 3),
-    'access arguments' => array('administer userqueues'),
-    'file' => 'userqueue.admin.inc',
-    'type' => MENU_CALLBACK
-  );
-  $items['admin/structure/userqueue/%userqueue/view'] = array(
-    'title' => 'View queue',
-    'page callback' => 'userqueue_view_queue',
-    'page arguments' => array(3),
-    'file' => 'userqueue.pages.inc',
-    'access arguments' => array('administer userqueue'),
-    'type' => MENU_CALLBACK,
-  );
-
-  $items['admin/structure/userqueue/%userqueue/edit'] = array(
-    'title' => 'Edit queue',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('userqueue_edit_form', 3),
-    'access arguments' => array('administer userqueues'),
-    'file' => 'userqueue.admin.inc',
-    'type' => MENU_CALLBACK,
-  );
-  $items['userqueue/%userqueue/remove-user/%user'] = array(
-    'page callback' => 'userqueue_admin_remove_user',
-    'page arguments' => array(1, 3),
-    'access arguments' => array('administer userqueues'),
-    'file' => 'userqueue.pages.inc',
-    'type' => MENU_CALLBACK
-  );
-
-  $items['userqueue/%userqueue/send-to-top/%user'] = array(
-    'page callback' => 'userqueue_admin_send_to_top',
-    'page arguments' => array(1, 3),
-    'access arguments' => array('administer userqueues'),
-    'file' => 'userqueue.pages.inc',
-    'type' => MENU_CALLBACK
-  );
-
-   $items['userqueue/%userqueue/send-to-bottom/%user'] = array(
-    'page callback' => 'userqueue_admin_send_to_bottom',
-    'page arguments' => array(1, 3),
-    'access arguments' => array('administer userqueues'),
-    'file' => 'userqueue.pages.inc',
-    'type' => MENU_CALLBACK
-  );
- 
- return $items;
-	
-}
-
-
-/**
- * Implements hook_permission().
- */
-function userqueue_permission() {
-  return array(
-    'administer userqueues' => array(
-      'title' => t('Administer userqueue'),
-      'description' => t('Administer the userqueue module.'),
-    ),
-   'manipulate userqueues' => array(
-      'title' => t('Manipulate userqueue'),
-      'description' => t('Manipulate userqueue.'),
-    ),
-  );
-}
-
-/**
- * Tool function for %userqueue
- */
-function userqueue_load($uqid) {
-  return db_select('userqueue', 'uq')
-          -> fields('uq')
-          -> condition('uqid', $uqid)
-          -> execute()
-          -> fetchObject();
-}
-
-/**
- * Return users from a userqueue
- */
-function userqueue_get_users($queue) {
-  $result = db_select('userqueue_user', 'uu')
-      -> fields('uu', array('uid', 'position'))
-      -> condition('uqid', $queue -> uqid)
-      -> orderBy('position', 'ASC')
-      -> execute();
-  $users = array();
-  foreach ($result as $row) {
-    $account = user_load($row -> uid);
-    if(is_object($account))
-    { 
-     	$account -> position = $row -> position;
-     	$users[$row -> uid] = $account;
-    }
- 
-
-    $account -> position = $row -> position;
-    $users[$row -> uid] = $account;
-  }
-  return $users;
-}
-
-/**
- * Implements hook_theme().
- */
-function userqueue_theme($existing, $type, $theme, $path) {
-  return array(
-    'userqueue_arrange_subqueue_form_table' => array(
-      'render element' => 'form',
-    ),
-  );
-}
-
-/**
- * Theme the subqueue overview as a sortable list.
- * @ingroup themeable
- */
-function theme_userqueue_arrange_subqueue_form_table($variables) {
-  $form = $variables['form'];
-  $output = '';
-  // get css to hide some of the help text if javascript is disabled
-  drupal_add_tabledrag('userqueue-dragdrop', 'order', 'sibling', 'user-position');
-
-  // render form as table rows
-  $rows = array();
-  $counter = 1;
-  foreach (element_children($form) as $key) {
-    if (isset($form[$key]['title'])) {
-      $row = array();
-      $row[] = drupal_render($form[$key]['photo']);
-      $row[] = drupal_render($form[$key]['title']);
-      $row[] = drupal_render($form[$key]['date']);
-      $row[] = drupal_render($form[$key]['position']);
-      $row[] = drupal_render($form[$key]['edit']);
-      $row[] = drupal_render($form[$key]['remove']);
-      $row[] = array(
-        'data' => $counter,
-        'class' => array('position')
-      );
-
-     $row[] = drupal_render($form[$key]['send_to_top']);
-     $row[] = drupal_render($form[$key]['send_to_bottom']);      
-	//$row[] = l('Send_to_top','home').l('Send_to_bottom','home');
-     	
-      $rows[] = array(
-        'data' => $row,
-        'class' => array('draggable'),
-      );
-     
-		
-    }
-    $counter ++;
-  }
-  if (empty($rows)) {
-    $rows[] = array(array('data' => t('No users in this queue.'), 'colspan' => 7));
-  }
-
-  // render the main userqueue table
-  $header = array(t('Photo'),t('Title'), t('Created'), t('Position'), array('data' => t('Operations'), 'colspan' => 2), t('Position'),array('data' =>t('Action'),'colspan'=>2));
-  $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => array('userqueue-dragdrop'), 'class' => array('userqueue-dragdrop'))));
-
-  return $output;
-}
-
-/**
- * Helper, delete a userqueue
- */
-function userqueue_delete_queue($uqid) {
-  db_delete('userqueue_user')
-      -> condition('uqid', $uqid)
-      -> execute();
-  db_delete('userqueue')
-      -> condition('uqid', $uqid)
-      -> execute();
-  drupal_set_message(t('Userqueue has been deleted.'));
-}
-
-/**
- * Load all userqueues
- */
-function userqueue_load_queues() {
-  $result = db_select('userqueue', 'uq')
-      -> fields('uq')
-      -> execute();
-  $queues = array();
-  foreach ($result as $queue) {
-    $queues[$queue->uqid] = $queue;
-  }
-  return $queues;
-}
-
-/**
- * Helper, update a userqueue
- */
-function userqueue_update_queue($queue, $uqid) {
-  $queue['uqid'] = $uqid;
-  drupal_write_record('userqueue', $queue, 'uqid');
-  return drupal_set_message(t("Updated queue '@name'.", array('@name' => $queue['title'])));
-}
-
-/**
- * Helper, create a new userqueue
- */
-function userqueue_create_queue($queue) {
-  if (drupal_write_record('userqueue', $queue)) {
-    drupal_set_message(t("Created queue '@name'.", array('@name' => $queue['title'])));
-    return $queue;
-  }
-}
-
-/**
- * Implements hook_user_delete().
- */
-
-function userqueue_user_delete($account) {
-
-        $query = db_select('userqueue_user')
-	->fields('userqueue_user',array('position','uqid'))	
-	->condition('uid', $account->uid,'=')
-	->execute()->fetchAssoc();
-
-	$c = $query['position'];
-        $d = $query['uqid']; 
-
-      db_delete('userqueue_user')
-       ->condition('uid', $account->uid)
-       ->execute();
-
-	db_update('userqueue_user')    
-	->expression('position','position - :position',array(':position' => 1))	
- 	->condition('position', $c,'>')       
-	->condition('uqid',$d,'=')
-        ->execute();
-
-
-}
-
-
-
-
diff --git a/userqueue.pages.inc~ b/userqueue.pages.inc~
deleted file mode 100644
index e23c453..0000000
--- a/userqueue.pages.inc~
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-
-/**
- * @file
- * Menu callback, arrange userqueue form
- */
-function userqueue_view_queue($queue) {
-  drupal_set_title($queue->title);
-  $users = userqueue_get_users($queue);
-  return drupal_get_form('userqueue_arrange_subqueue_form', $queue, $users);
-}
-
-/**
- * Menu callback, remove user from a userqueue
- */
-function userqueue_admin_remove_user($queue, $account) {
-
-	$query = db_select('userqueue_user')
-	->fields('userqueue_user',array('position'))	
-	->condition('uid', $account->uid,'=')
-        ->condition('uqid', $queue->uqid,'=')	
-	->execute()->fetchAssoc();
-
-	$c = $query['position'];
-
-
-  db_delete('userqueue_user')
-      ->condition('uid', $account->uid)
-      ->condition('uqid', $queue->uqid)
-      ->execute();
-
-
-	db_update('userqueue_user')    
-	->expression('position','position - :position',array(':position' => 1))	
- 	->condition('position', $c,'>')       
-	->condition('uqid', $queue->uqid,'=')
-        ->execute();
-
-
-  drupal_goto($_GET['destination']);
-}
-
-/**
- * Form definition for userqueue drag'n'drop form.
- */
-function userqueue_arrange_subqueue_form($form, $form_state, $queue, $users) {
-  $form = array('#tree' => TRUE);
-  // Prepare the main part of the form which will be themed as a table.
-  $count = count($users);
-  $form['users'] = array();
-  $form['users']['#theme'] = 'userqueue_arrange_subqueue_form_table';
-
-  // Theme function needs these.
-  $form['users']['#queue'] = (array) $queue;
-  foreach ($users as $account) {
-//  $form['users'][$account->uid]['photo'] = array('#markup' => theme('user_picture'),'#account' => $account);  
-    if(isset($account->picture->uri) == TRUE)
-	$path = image_style_url("thumbnail",$account->picture->uri);
-    else
-	$path = "No Image";
-    $form['users'][$account->uid]['photo'] = array('#markup' => theme('image', array('path' => $path)));
-    $form['users'][$account->uid]['#user'] = (array) $account;
-    $form['users'][$account->uid]['title'] = array('#markup' => theme('username', array('account' => $account)));
-    $form['users'][$account->uid]['date'] = array(
-      '#markup' => format_date($account->created, 'short'),
-    );
-    $form['users'][$account->uid]['edit'] = array('#markup' => l(t('edit'), 'user/' . $account->uid . '/edit', array('attributes' => array('title' => t('Edit this user')))));
-    $form['users'][$account->uid]['position'] = array(
-      '#type' => 'weight',
-      '#delta' => $count,
-      '#default_value' => $account->position,
-      '#attributes' => array(
-        'class' => array('user-position'),
-      ),
-    );
-    $attr = array(
-      '#attributes' => array(
-        'title' => t('Remove from queue'),
-        'style' => 'display: none;',
-        'class' => array('userqueue-remove'),
-        'id' => 'userqueue-remove-' . $account->uid,
-      ),
-      'query' => drupal_get_destination(),
-    );
-    $form['users'][$account->uid]['remove'] = array(
-      '#markup' => l(t('remove'), 'userqueue/' . $queue->uqid . '/remove-user/' . $account->uid, $attr),
-    );
- 
-    $form['users'][$account->uid]['send_to_top'] = array(
-	'#markup' => l(t('send_to_top'),'userqueue/'.$queue->uqid.'/send-to-top/'.$account->uid,$attr),
-    );    	
-
-    $form['users'][$account->uid]['send_to_bottom'] = array(
-	'#markup' => l(t('send_to_bottom'),'userqueue/'.$queue->uqid.'/send-to-bottom/'.$account->uid,$attr),
-    );	
-
-  }
-
-  // Textfield for adding users to the queue.
-  $form['add'] = array(
-    '#type' => 'container',
-    '#attributes' => array('class' => array('container-inline')),
-  );
-  $form['add']['user'] = array(
-    '#type' => 'textfield',
-    '#autocomplete_path' => 'user/autocomplete',
-    '#maxlength' => 1024,
-  );
-  $form['add']['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Add user'),
-    '#submit' => array('userqueue_arrange_subqueue_form_add_submit'),
-  );
-
-
-  // Submit, reverse, shuffle, and clear actions.
-  $form['actions'] = array('#type' => 'actions');
-  $form['actions']['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Save'),
-  );
-  $form['actions']['back'] = array(
-	'#type' => 'submit',
-	'#value' => t('Back'),
-	'#submit' =>array('admin_userqueue_go_back'), 
-  );
-
-  // Disable all buttons if the queue is empty.
-  if ($count == 0) {
-    $form['actions']['submit']['#disabled'] = TRUE;
-  }
-
-  return $form;
-}
-
-
-/*
- * Defines action for back button.
- */
-
-function admin_userqueue_go_back()
-{
-	drupal_goto('/admin/structure/userqueue');
-}
-
-
-
-/**
- * Submit handler, add a new user in the queue.
- */
-function userqueue_arrange_subqueue_form_add_submit($form, $form_state) {
-  $val = $form_state['values']['add'];
-  $uid = db_select('users', 'u')
-      ->fields('u', array('uid'))
-      ->condition('name', $val['user'])
-      ->execute()
-      ->fetchField();
-  $uqid = $form['users']['#queue']['uqid'];
-  $query = db_select('userqueue_user', 'uu');
-  $query->addExpression('MAX(position)', 'position');
-  $position = $query->condition('uqid', $uqid)
-    ->execute()->fetchField();
-  if ($uid) {
-    $item = new stdClass();
-    $item->uid = $uid;
-    $item->position = ($position + 1);
-    $item->uqid = $uqid;
-
-    //Catch handler for Unique key violation.
-    try {
-      drupal_write_record('userqueue_user', $item);
-      drupal_set_message(t('User %username has been added', array('%username' => $val['user'])));
-    }catch (PDOException $e) {
-      if($e->getCode() == 23000){
-        drupal_set_message(t('User %username already present in UserQueue.', array('%username' => $val['user'])),'error');
-      }
-    }
-  }
-}
-
-/**
- * Submit handler.
- */
-function userqueue_arrange_subqueue_form_submit($form, $form_state) {
-  $users = array();
-  foreach ($form_state['values']['users'] as $uid => $element) {
-    $users[$form_state['values']['users'][$uid]['position']] = array(
-      'uid' => $uid,
-      'data' => $form_state['values']['users'][$uid],
-    );
-  }
-  $uqid = $form['users']['#queue']['uqid'];
-  userqueue_save_queue_order($users, $uqid);
-}
-
-/**
- * Validate handler.
- */
-function userqueue_arrange_subqueue_form_validate($form, $form_state) {
-  $positions = array();
-  $error = FALSE;
-  if (isset($form_state['values']['users'])) {
-    foreach ($form_state['values']['users'] as $uid => $element) {
-      if (is_numeric($uid) && is_numeric($element['position'])) {
-        $positions[$uid] = $element['position'];
-      }
-    }
-  }
-  if (count(array_unique($positions)) < count($positions)) {
-    $seen = array();
-    foreach ($positions as $uid => $position) {
-      if (isset($seen[$position])) {
-        form_set_error('users][' . $uid . '][position');
-        $error = TRUE;
-      }
-      $seen[$position] = TRUE;
-    }
-    if ($error) {
-      drupal_set_message(t('There are one or more duplicate position value(s).'), 'error');
-    }
-  }
-}
-
-/**
- * Validates new queue order information and if it passes validation,
- * deletes the old queue data from the database and saves the new data.
- */
-function userqueue_save_queue_order($users, $uqid) {
-  $positions = array();
-  $now = REQUEST_TIME;
-  $queue = userqueue_load($uqid);
-
-  // Cleanup the node array.
-  $clean = array();
-  $count = 1;
-  ksort($users);
-  foreach ($users as $pos => $account) {
-    if (is_numeric($pos)) {
-      $clean[$count] = $account;
-      $count++;
-    }
-  }
-  $users = $clean;
-  // Clear the queue and save the new positions.
-  db_delete('userqueue_user')
-      ->condition('uqid', $uqid)
-      ->execute();
-
-  foreach ($users as $pos => $user) {
-    $args = array();
-    $query = db_insert('userqueue_user')
-        ->fields(array(
-          'uqid' => $uqid,
-          'uid' => $user['uid'],
-          'position' => $pos,
-        ))
-        ->execute();
-  }
-  return drupal_set_message(t('The queue has been updated.'));
-}
-
-
-/*
- *  Defines action of send_to_top link.
- */
-
-
-function userqueue_admin_send_to_top($queue, $account)
-{
-	
-	 
-	$query = db_select('userqueue_user')
-	->fields('userqueue_user',array('position'))	
-	->condition('uid', $account->uid,'=')
-        ->condition('uqid', $queue->uqid,'=')	
-	->execute()->fetchAssoc();
-
-	$c = $query['position'];
-			
-	db_update('userqueue_user')    
-	->expression('position','position + :position',array(':position' => '1'))		
- 	->condition('position',$c,'<')       
-	->condition('uqid', $queue->uqid,'=')
-        ->execute();
-
-	db_update('userqueue_user')    
-	->fields(array('position' => '1'))	
-        ->condition('uid',$account->uid,'=')
-        ->condition('uqid', $queue->uqid,'=')
-        ->execute();
-
-
-	drupal_goto('admin/structure/userqueue');
-
-}
-
-/*
- *  Defines action of send_to_bottom link.
- */
-
-
-
-function userqueue_admin_send_to_bottom($queue, $account)
-{
-	 
-	$query = db_select('userqueue_user')
-	->fields('userqueue_user',array('position'))	
-	->condition('uid', $account->uid,'=')
-        ->condition('uqid', $queue->uqid,'=')	
-	->execute()->fetchassoc();
-
-	$c = $query['position'];
-
-	
-
-    	$result = db_select('userqueue_user', 'u')
-            ->fields('u')
-	    ->condition('uqid',$queue->uqid,"=")
-            ->execute();
-    	
-	$d = $result->rowCount();
-
-
-	db_update('userqueue_user')    
-	->expression('position','position - :position',array(':position' => 1))	
- 	->condition('position', $c,'>')       
-	->condition('uqid', $queue->uqid,'=')
-        ->execute();
-
-	db_update('userqueue_user')    
-	->fields(array('position' => $d))	
-        ->condition('uid',$account->uid,'=')
-        ->condition('uqid', $queue->uqid,'=')
-        ->execute();
-	
-
-	drupal_goto($_GET['destination']);
-
-}
-
-