Closes #31
Remove unused files
Closes #32
Merge branch 'dev' into carcade
Merge