yeah. dont touch the tps (throttle position sensor) on the tb, leave it on when cleaning, just dont bang or drop it.
Take tha battery off, and when your done, hook it up and turn on the ignition, dont start it, there will be loads of whirring and clicking - when that stops, you can start the engine.
vag-com can force a tb alignment, if you have it.