clean project
Merge branch 'clean' into dev