Cleanup Transaction inheritance - 2