last minute hacking to make it demoable
remove yi's selection (since replaced with own version)