Fix bandage usage and remove async task