More cleanup, RBO now responsible for generating the TX hash