Not removing folders properly
Merge branch 'develop'

* develop:
  Not removing folders properly