More robust dir cleanup
Fixed wrong command