Remove unfinished magiciswaiting support