Kill two TODOs with one commit. Yeah!

Also ensure backed up refs are removed on rollback.