Bumped up version and removed a ton of unnecessary resources
Cleaned up code
Merge branch 'release/v3.1' into develop