torsors and clean up