DIR cleanup
Fixed issue caused by cleanup