remove unecessary vars
Remove transaction_started until we persist it
Remove logging from wait-to-finish