remove unnecessary folder operations
Merge branch 'staging'