.gitignore
cleanup
Merge branch 'feature/cleanup' into develop