Adding some delete stuff. Definitely not working quite right yet..
-ES
Merge remote-tracking branch 'origin/master'