Better failed transaction handling
Remove unnecessary include