Prevent duplicate 'transaction' events from Remote
Cleanup transactionqueue
Fix merge conflict