diff --git a/.bashrc b/.bashrc
index 7e6f478ca35a391e63f370f5625fb6291c955861..aff194fa0d4a2212fbe4fcb66cb7da9df358cc6a 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,19 +1,8 @@
 # If not running interactively, don't do anything
 [ -z "$PS1" ] && return
 
-# don't put duplicate lines in the history. See bash(1) for more options
-# don't overwrite GNU Midnight Commander's setting of `ignorespace'.
-export HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups
-# ... or force ignoredups and ignorespace
 export HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
 shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
 shopt -s checkwinsize
 
 # make less more friendly for non-text input files, see lesspipe(1)
@@ -24,58 +13,13 @@ if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
     debian_chroot=$(cat /etc/debian_chroot)
 fi
 
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
     eval "`dircolors -b`"
     alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
     alias grep='grep --color=auto'
-    #alias fgrep='fgrep --color=auto'
-    #alias egrep='egrep --color=auto'
 fi
 
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
 if [ -f /etc/bash_completion ]; then
     . /etc/bash_completion
 fi
@@ -89,24 +33,11 @@ alias ll='ls -l'
 alias la='ls -A'
 alias l='ls -CF'
 alias gcc='gcc --std=c99 -Wall'
-alias dpkglog='cat /var/log/dpkg.log | grep -v status | grep -v trigproc | grep -v configure'
+alias dpkglog="grep -v 'status\|trigproc\|configure' /var/log/dpkg.log"
 alias deborphan='deborphan -a --no-show-section'
 export REPREPRO_BASE_DIR=$HOME/Documents/Shore/debian-repository
-#export PATH="$PATH:/usr/lib/kde4/libexec"
 export EDITOR=vim
-alias ansible-vagrant='ansible-playbook Ansible/vagrant.yml -s -i \
-.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory \
---private-key=$HOME/.vagrant.d/insecure_private_key -u vagrant -e "state=\
-dev"'
 alias ansible-local='ansible localhost -c local -i localhost,'
 alias ansible-local-playbook='ansible-playbook -i localhost,'
-alias backup='cat Documents/Backup\ list.yml | \
-Documents/yaml2duplicity_include_list.py | duplicity --exclude $HOME \
---include-filelist-stdin $HOME file:///media/nimrod/backup'
-alias gen_ssh_config='cat $HOME/.ssh/config.d/* > $HOME/.ssh/config'
+alias gen-ssh-config='cat $HOME/.ssh/config.d/* > $HOME/.ssh/config'
 alias ssl-ca='$HOME/Documents/Shore/ssl-ca/ssl-ca'
-new_cgit_repo ()
-{
-    ssh cgit "git init --bare /srv/git/$1"
-    git clone ssh://cgit/srv/git/$1
-}