Removed deprecated step in setup.cmd and fixed cleanup