Commented need for transaction. Optimized imports