clean generated toolwrapper code