Merging 4e2601f071dcb2d573b49d096c2a7c3e0fdf05ae
Removed dead file
Clean up files
Merge branch 'master' into dev-master