removing unneeded files
Merge branch 'master' into cleanup