Remove defers for upcoming wip fixes
Fix handling of operations to be more thread safe. This commit is a modification of @arnehormann s great work.