Made IRemovalListener onRemoval return Task instead of void.