Very small changes
Merge branch 'master' into spreadout
Deleted unnecessary files