Added removal of setup folder