Merge branch 'ee/clean-remove-dirs'