Remove a piece of trash
Merge branch 'develop' into develop_IOS