Revert "cleanup directory"

This reverts commit 083e8692a7eb57e155099dfeaa93a7887b63099c.
Revert "Revert "cleanup directory""

This reverts commit 35ffbb6b550fc1bff7ba7586bcab72b366228cfc.
directory cleanup