Some cleanup.
Added some backup rollback logic.