Cleanup, threw out old stuff not used
Merge branch 'master' of https://github.com/ornatwork/auradesktop