[MERGE][FIX] Delete all reference to wizard