Removed not used files
Merge branch 'develop' into share-build