Finished removing WBTD code.