removed files that were no longer needed
Merge branch 'master' into frontend