Bug fix with removing old setup folder.
Bug fix for reinstall.