You could call ``removeUnitOf`` inside ``waitLoadedTyped``...