Development: deleted unused files
Merge branch 'development'