Code cleanup after removing ResultReceiver