Added directories cleanup