Fix removal of transfer components