more setup and version cleanup