Remove unused imports
Properly deal with transactions in execute