Removed various files
Removed files
Merge branch 'beta'