Refactor V2 transforms

[CharliePoole]

Clean up old V2 transforms as much as possible.

[harrisonmeister]

Will get to this start of next week. Manic week so far. Helpfully with existing v2 tests now, my comparison should be nice and easy thanks @CharliePoole 👍