Added removal of output directories