removing unnecessary make files
Merge branch 'master' into mw_master