deleted files we're not using
Merge branch 'master' into cleanup