Cleanup some obsolete TODOs and unused code.

Test: atest RollbackTest
Change-Id: I7b10533bb3658c113bfa9986b8241720b0a159a3
Merged-In: I67610d3467d737cbfc085f00ea0b509b63f4612b
1 file changed