Execute it is
Remove now useless code
Cleanup
More TODOs
Add skipped test
Kill two TODOs with one commit. Yeah!

Also ensure backed up refs are removed on rollback.