Internal remote refactoring to be NSOperation-centric