Long running operation's are executed at off-thread
Some cleanups...