Removed unused file
Merge branch 'master' into desktop-modifications
Removed features that don't work on 13.10