Merge commit '76742cdb9334de005cb26c8c3afe1d086ca17d67' into develop
Removed unused files