Removing duplicated transaction start/complete